From aa554c8210026f16bbe389db259ac54b7c007591 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Sun, 29 Oct 2017 12:59:12 -0700 Subject: [PATCH] added coveralls support --- .travis.yml | 2 + gruntfile.js | 16 +- package.json | 1 + tests/client/mockData.js | 588 --------------------------------------- 4 files changed, 6 insertions(+), 601 deletions(-) delete mode 100644 tests/client/mockData.js diff --git a/.travis.yml b/.travis.yml index e092c961..f03b879b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,7 @@ services: addons: code_climate: repo_token: 6c3a1b81a09b2338d6f30913c1bcad115026689752cbb499a0a25061cda6fbcf +script: + - npm travis after_script: - grunt coverage diff --git a/gruntfile.js b/gruntfile.js index 1ed5f52b..98759acd 100755 --- a/gruntfile.js +++ b/gruntfile.js @@ -204,18 +204,6 @@ module.exports = function(grunt) { singleRun: true } }, - protractor: { - options: { - configFile: 'protractor.conf.js', - keepAlive: true, - noColor: false - }, - e2e: { - options: { - args: {} // Target-specific arguments - } - } - }, mocha_istanbul: { coverage: { src: watchFiles.allTests, // a folder works nicely @@ -349,9 +337,11 @@ module.exports = function(grunt) { grunt.registerTask('setup', ['execute']); // Test task(s). - grunt.registerTask('test', ['lint:tests', 'test:server', 'test:client']); + grunt.registerTask('test', ['test:server', 'test:client']); grunt.registerTask('test:server', ['lint:tests', 'env:test', 'mochaTest']); grunt.registerTask('test:client', ['lint:tests', 'html2js:main', 'html2js:forms', 'env:test', 'karma:unit']); + grunt.registerTask('test:travis', ['env:test', 'html2js:main', 'html2js:forms', 'env:test', 'karma:unit', 'mochaTest', 'coveralls']); + grunt.registerTask('testdebug', ['env:test', 'karma:debug']); }; diff --git a/package.json b/package.json index c1e2f083..608280ba 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "generate": "all-contributors generate", "start": "grunt", "test": "grunt test", + "travis": "grunt test:travis", "postinstall": "bower install --config.interactive=false; grunt build;", "init": "node scripts/setup.js" }, diff --git a/tests/client/mockData.js b/tests/client/mockData.js deleted file mode 100644 index 4b37219b..00000000 --- a/tests/client/mockData.js +++ /dev/null @@ -1,588 +0,0 @@ -module.exports = { - sampleUser: { - "_id": "598cb79e43859500277bc804", - "lastModified": "2017-10-06T05:36:28.394Z", - "email": "test@test.com", - "username": "test1234", - "salt": null, - "__v": 0, - "resetPasswordExpires": "2017-10-06T06:36:28.391Z", - "resetPasswordToken": "2d95c01d79fb06c73691577cd82e5cce2ff616f1", - "created": "2017-08-10T19:44:30.601Z", - "language": "en", - "roles": ["user"], - "provider": "local", - "passwordHash": null, - "lastName": "Full", - "firstName": "Name" - }, - - sampleForm1: { - "_id": "59d25a9d413a7a3106878556", - "lastModified": "2017-10-19T00:46:24.056Z", - "title": "Form Title", - "created": "2017-10-02T15:26:21.221Z", - "admin": this.sampleUser, - "design": { - "colors": { - "buttonTextColor": "#333", - "buttonColor": "#fff", - "answerColor": "#333", - "questionColor": "#333", - "backgroundColor": "#fff" - } - }, - "isLive": true, - "hideFooter": false, - "endPage": { - "buttons": [], - "buttonText": "Go back to Form", - "title": "Thank you for filling out the form", - "showEnd": false - }, - "startPage": { - "buttons": [], - "introButtonText": "Start", - "introTitle": "Welcome to Form", - "showStart": false - }, - "submissions": [], - "form_fields": [{ - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "First Name", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "nascar", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "hockey", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }], - "analytics": { - "visitors": [], - "fields": [{ - "field": { - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "Short Text3", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "Short Text4", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "Short Text5", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }], - "conversionRate": 0, - "submissions": 0, - "views": 0 - }, - "language": "en", - "id": "59d25a9d413a7a3106878556" - }, - - sampleForm2: { - "_id": "52f6d0f87f5a407a384220e3", - "lastModified": "2017-10-19T00:46:24.056Z", - "title": "Form Title2", - "created": "2017-10-02T15:26:21.221Z", - "admin": this.sampleUser, - "design": { - "colors": { - "buttonTextColor": "#333", - "buttonColor": "#fff", - "answerColor": "#333", - "questionColor": "#333", - "backgroundColor": "#fff" - } - }, - "isLive": true, - "hideFooter": false, - "endPage": { - "buttons": [], - "buttonText": "Go back to Form", - "title": "Thank you for filling out the form", - "showEnd": false - }, - "startPage": { - "buttons": [], - "introButtonText": "Start", - "introTitle": "Welcome to Form", - "showStart": false - }, - "submissions": [], - "form_fields": [{ - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "First Name", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "nascar", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "hockey", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }], - "analytics": { - "visitors": [], - "fields": [{ - "field": { - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "Short Text3", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "Short Text4", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "Short Text5", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }], - "conversionRate": 0, - "submissions": 0, - "views": 0 - }, - "language": "en", - "id": "59d25a9d413a7a3106878556" - }, - - sampleForm3: { - "_id": "2fab9ed873937f0e1dea0ce1", - "lastModified": "2017-10-19T00:46:24.056Z", - "title": "Form Title3", - "created": "2017-10-02T15:26:21.221Z", - "admin": this.sampleUser, - "design": { - "colors": { - "buttonTextColor": "#333", - "buttonColor": "#fff", - "answerColor": "#333", - "questionColor": "#333", - "backgroundColor": "#fff" - } - }, - "isLive": true, - "hideFooter": false, - "endPage": { - "buttons": [], - "buttonText": "Go back to Form", - "title": "Thank you for filling out the form", - "showEnd": false - }, - "startPage": { - "buttons": [], - "introButtonText": "Start", - "introTitle": "Welcome to Form", - "showStart": false - }, - "submissions": [], - "form_fields": [{ - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "First Name", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "nascar", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "hockey", - "fieldType": "checkbox", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }], - "analytics": { - "visitors": [], - "fields": [{ - "field": { - "globalId": "hSsZT02ICgcdvLTrbwCyYjl19qG9gQdAzO7ZDF2Esj4", - "lastModified": "2017-10-19T00:46:24.053Z", - "title": "Short Text3", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "expressionString": "field == static", - "jumpTo": "59e7f5d242a56fca5bf79365", - "valueB": "hello", - "_id": "59e7f5c442a56fca5bf7935e", - "enabled": true, - "id": "59e7f5c442a56fca5bf7935e" - }, - "_id": "59e7f5c442a56fca5bf7935d", - "created": "2017-10-19T00:45:56.855Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "N2DthDVEJfXvNU4JsYyax6PrCbHzump8QTnyc1hnAVR", - "lastModified": "2017-10-19T00:46:24.054Z", - "title": "Short Text4", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5c842a56fca5bf79361", - "enabled": false, - "id": "59e7f5c842a56fca5bf79361" - }, - "_id": "59e7f5c842a56fca5bf79360", - "created": "2017-10-19T00:46:00.484Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }, { - "field": { - "globalId": "7vnFgEhKCZWwb6rR29Lat7mePmBK05fDTashc3modje", - "lastModified": "2017-10-19T00:46:24.055Z", - "title": "Short Text5", - "fieldType": "textfield", - "fieldValue": "", - "logicJump": { - "_id": "59e7f5d242a56fca5bf79366", - "enabled": false, - "id": "59e7f5d242a56fca5bf79366" - }, - "_id": "59e7f5d242a56fca5bf79365", - "created": "2017-10-19T00:46:10.619Z", - "validFieldTypes": ["textfield", "date", "email", "link", "legal", "url", "textarea", "statement", "welcome", "thankyou", "file", "dropdown", "scale", "rating", "radio", "checkbox", "hidden", "yes_no", "natural", "stripe", "number"], - "deletePreserved": false, - "disabled": false, - "required": true, - "fieldOptions": [], - "description": "", - "isSubmission": false - }, - "dropoffRate": 0, - "continueRate": 0, - "totalViews": 0, - "responses": 0, - "dropoffViews": 0 - }], - "conversionRate": 0, - "submissions": 0, - "views": 0 - }, - "language": "en", - "id": "59d25a9d413a7a3106878556" - }, - - sampleFormList: [this.sampleForm1, this.sampleForm2, this.sampleForm3], -} \ No newline at end of file