diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..d90d5a593 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,3 @@ +.gitignore +assets/scripts/*.* +report/**/*.* \ No newline at end of file diff --git a/app/submissions/submit-design-files/submit-design-files.spec.js b/app/submissions/submit-design-files/submit-design-files.spec.js index c5e422fa7..05bd18162 100644 --- a/app/submissions/submit-design-files/submit-design-files.spec.js +++ b/app/submissions/submit-design-files/submit-design-files.spec.js @@ -19,7 +19,12 @@ describe('Submit Design Files Controller', function() { } var submissionsService = { - getPresignedURL: function() {} + getPresignedURL: function() {}, + startSubmission: function() { + var deferred = $q.defer() + deferred.resolve() + return deferred.promise + } } var mockWindow = { @@ -30,7 +35,7 @@ describe('Submit Design Files Controller', function() { beforeEach(function() { bard.appModule('tc.submissions') - bard.inject(this, '$controller', '$rootScope') + bard.inject(this, '$controller', '$rootScope', '$q') scope = $rootScope.$new() }) @@ -59,7 +64,7 @@ describe('Submit Design Files Controller', function() { challengeToSubmitTo: { challenge: { name: 'Challenge Name', - track: 'DEVELOP', + track: 'DESIGN', id: 30049240 } }, @@ -127,7 +132,7 @@ describe('Submit Design Files Controller', function() { }) }) - describe.skip('uploadSubmission', function() { + describe('uploadSubmission', function() { it('adds comments to the submissions body', function() { vm.comments = 'test comments' scope.$digest() @@ -149,7 +154,7 @@ describe('Submit Design Files Controller', function() { }) it('calls the submission service', function() { - var mockAPICall = sinon.spy(submissionsService, 'getPresignedURL') + var mockAPICall = sinon.spy(submissionsService, 'startSubmission') vm.uploadSubmission() scope.$digest() diff --git a/app/submissions/submit-develop-files/submit-develop-files.spec.js b/app/submissions/submit-develop-files/submit-develop-files.spec.js index a06ad2a6e..0b980d0ed 100644 --- a/app/submissions/submit-develop-files/submit-develop-files.spec.js +++ b/app/submissions/submit-develop-files/submit-develop-files.spec.js @@ -1,5 +1,5 @@ /*eslint no-undef:0*/ -describe.skip('Submit Develop Files Controller', function() { +describe('Submit Develop Files Controller', function() { var controller, vm, scope var mockChallenge = { @@ -59,7 +59,7 @@ describe.skip('Submit Develop Files Controller', function() { challengeToSubmitTo: { challenge: { name: 'Challenge Name', - track: 'DESIGN', + track: 'DEVELOP', id: 30049240 } }, diff --git a/package.json b/package.json index df194566a..e0f7bb5a1 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "scripts": { "build": "webpack --bail --progress --build --tc", "start": "webpack-dev-server --history-api-fallback --host 0.0.0.0 --dev --tc --inline --progress --port 3000", - "lint": "eslint --ignore-path .gitignore .", + "lint": "eslint .", "test": "karma start --tc --test" }, "devDependencies": { diff --git a/webpack.config.js b/webpack.config.js index 0d394ffaf..3933f5967 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,7 +29,7 @@ const config = require('appirio-tech-webpack-config')({ favicon: './assets/images/favicon.ico', uglifyOptions: { mangle: { except: ['Auth0'] } - } + } }) if (CI) config.output.publicPath = process.env.ASSET_PREFIX