Commit 301ca5c3 by Andy Armstrong

Fixes

parent 7b6604a4
...@@ -52,6 +52,7 @@ install: install-wheels install-python install-js install-nltk-data install-test ...@@ -52,6 +52,7 @@ install: install-wheels install-python install-js install-nltk-data install-test
quality: quality:
jshint openassessment/xblock/static/js/src -c .jshintrc --verbose jshint openassessment/xblock/static/js/src -c .jshintrc --verbose
./node_modules/jscs/bin/jscs openassessment/xblock/static/js/src --preset google
test: quality test-python test-js test: quality test-python test-js
......
...@@ -15,7 +15,7 @@ from openassessment.assessment.models import StudentTrainingWorkflow ...@@ -15,7 +15,7 @@ from openassessment.assessment.models import StudentTrainingWorkflow
import submissions.api as sub_api import submissions.api as sub_api
from openassessment.assessment.api import peer as peer_api from openassessment.assessment.api import peer as peer_api
from openassessment.assessment.api import self as self_api from openassessment.assessment.api import self as self_api
from openassessment.workflow.models import AssessmentWorkflow from openassessment.workflow.models import AssessmentWorkflow, AssessmentApiLoadError
from openassessment.workflow.errors import AssessmentWorkflowInternalError from openassessment.workflow.errors import AssessmentWorkflowInternalError
...@@ -368,7 +368,7 @@ class TestAssessmentWorkflowApi(CacheResetTest): ...@@ -368,7 +368,7 @@ class TestAssessmentWorkflowApi(CacheResetTest):
item_id=ITEM_1['item_id'] item_id=ITEM_1['item_id']
) )
with self.assertRaises(AssessmentWorkflowInternalError): with self.assertRaises(AssessmentApiLoadError):
workflow_api.update_from_assessments(submission['uuid'], {}) workflow_api.update_from_assessments(submission['uuid'], {})
def test_cancel_the_assessment_workflow(self): def test_cancel_the_assessment_workflow(self):
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
"phantomjs": "^1.9.11", "phantomjs": "^1.9.11",
"sinon": "^1.10.3", "sinon": "^1.10.3",
"uglify-js": "2.3.6", "uglify-js": "2.3.6",
"jshint": "2.8.0" "jshint": "2.8.0",
"jscs": "2.6.0"
}, },
"scripts": { "scripts": {
"test": "./node_modules/karma/bin/karma start --reporters spec,coverage" "test": "./node_modules/karma/bin/karma start --reporters spec,coverage"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment