Merge pull request #13 from edx/sanchez/bdd

Updating the settings files to pick up the new applications

apps/openassessment/peer/features/required_reviews.py

@@ -31,4 +31,4 @@ def then_the_student_is_notified_they_did_not_review_enough_peer_submissions(ste
 
 @step(u'Then: The student receives reviews.')
 def then_the_student_receives_reviews(step):
-    pass
\ No newline at end of file
+    pass

apps/openassessment/peer/features/required_reviews_validation.py

@@ -13,6 +13,10 @@ def and_i_configure_required_reviewers_per_student(step, required):
 def and_i_configure_required_reviewers_per_student(step, required):
     pass
 
+@step(u'And: I configure "([^"]*)" required reviews per submission')
+def and_i_configure_group1_required_reviews_per_submission(step, group1):
+    pass
+
 @step(u'Then: The validation "([^"]*)"')
 def then_the_validation(step, result):
     pass

settings/base.py

@@ -129,10 +129,8 @@ INSTALLED_APPS = (
     'django.contrib.staticfiles',
     'django.contrib.admin',
     'django.contrib.admindocs',
-    'peer_grading',
-    'common_grading',
     'submissions',
-    'openresponse.peer',
+    'openassessment.peer',
 )
 
 # A sample logging configuration. The only tangible logging

settings/test.py

@@ -5,7 +5,7 @@ Test-specific Django settings.
 # Inherit from base settings
 from .base import *
 
-TEST_APPS = ('peer_grading', 'common_grading',)
+TEST_APPS = ('openassessment.peer', 'submissions',)
 
 # Configure nose
 NOSE_ARGS = [

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup
 
-PACKAGES = ['common_grading', 'peer_grading']
+PACKAGES = ['submissions', 'openassessment.peer']
 
 
 def is_requirement(line):
@@ -39,5 +39,6 @@ setup(
         'Programming Language :: Python',
     ],
     packages=PACKAGES,
+    package_dir={'': 'apps'},
     install_requires=REQUIREMENTS,
 )