Skip to content

Commit f0e568a

Browse files
committed
rename server side e2e tests to integration tests
1 parent fb28c28 commit f0e568a

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

app/templates/Gruntfile.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ module.exports = function (grunt) {
170170
},
171171
src: [
172172
'server/**/*.js',
173-
'!server/**/*.{spec,e2e}.js'
173+
'!server/**/*.{spec,integration}.js'
174174
]
175175
},
176176
serverTest: {
177177
options: {
178178
jshintrc: 'server/.jshintrc-spec'
179179
},
180-
src: ['server/**/*.{spec,e2e}.js']
180+
src: ['server/**/*.{spec,integration}.js']
181181
},
182182
all: [
183183
'<%%= yeoman.client %>/{app,components}/**/*.js',
@@ -493,8 +493,8 @@ module.exports = function (grunt) {
493493
unit: {
494494
src: ['server/**/*.spec.js']
495495
},
496-
e2e: {
497-
src: ['server/**/*.e2e.js']
496+
integration: {
497+
src: ['server/**/*.integration.js']
498498
}
499499
},
500500

@@ -504,7 +504,7 @@ module.exports = function (grunt) {
504504
excludes: [
505505
'**/*.spec.js',
506506
'**/*.mock.js',
507-
'**/*.e2e.js'
507+
'**/*.integration.js'
508508
],
509509
reporter: 'spec',
510510
require: ['mocha.conf.js'],
@@ -513,17 +513,17 @@ module.exports = function (grunt) {
513513
},
514514
src: 'server'
515515
},
516-
e2e: {
516+
integration: {
517517
options: {
518518
excludes: [
519519
'**/*.spec.js',
520520
'**/*.mock.js',
521-
'**/*.e2e.js'
521+
'**/*.integration.js'
522522
],
523523
reporter: 'spec',
524524
require: ['mocha.conf.js'],
525-
mask: '**/*.e2e.js',
526-
coverageFolder: 'coverage/server/e2e'
525+
mask: '**/*.integration.js',
526+
coverageFolder: 'coverage/server/integration'
527527
},
528528
src: 'server'
529529
}
@@ -822,7 +822,7 @@ module.exports = function (grunt) {
822822
'env:all',
823823
'env:test',
824824
'mochaTest:unit',
825-
'mochaTest:e2e'
825+
'mochaTest:integration'
826826
]);
827827
}
828828

@@ -867,11 +867,11 @@ module.exports = function (grunt) {
867867
]);
868868
}
869869

870-
else if (option === 'e2e') {
870+
else if (option === 'integration') {
871871
return grunt.task.run([
872872
'env:all',
873873
'env:test',
874-
'mocha_istanbul:e2e'
874+
'mocha_istanbul:integration'
875875
]);
876876
}
877877

File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)