Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 0662eaa

Browse files
committed
chore(protractor): rename docs e2e test suite with -docs suffix
Due to the need to create a non-docs set of E2E tests, these are being moved. The old grunt commands will eventually be replaced with an alias which invokes both the simple E2E tests as well as the docs E2E tests.
1 parent 6502ab0 commit 0662eaa

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

Gruntfile.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ module.exports = function(grunt) {
101101
},
102102

103103

104-
protractor: {
104+
'protractor-docs': {
105105
normal: 'protractor-conf.js',
106106
travis: 'protractor-travis-conf.js',
107107
jenkins: 'protractor-jenkins-conf.js'
@@ -318,16 +318,17 @@ module.exports = function(grunt) {
318318

319319

320320
//alias tasks
321-
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
321+
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'jscs', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor-docs']);
322322
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
323323
grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
324324
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
325325
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
326326
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
327-
grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
328-
grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);
329-
grunt.registerTask('test:ci-protractor', 'Run the end to end tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor:jenkins']);
330-
grunt.registerTask('test:e2e', 'Alias for test:protractor', ['test:protractor']);
327+
grunt.registerTask('test:protractor-docs', 'Run the end to end docs tests with Protractor and keep a test server running in the background',
328+
['webdriver', 'connect:testserver', 'protractor-docs:normal']);
329+
grunt.registerTask('test:travis-protractor-docs', 'Run the end to end docs tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor-docs:travis']);
330+
grunt.registerTask('test:ci-protractor-docs', 'Run the end to end docs tests with Protractor for Jenkins CI builds', ['webdriver', 'connect:testserver', 'protractor-docs:jenkins']);
331+
grunt.registerTask('test:docs-e2e', 'Alias for test:protractor', ['test:protractor-docs']);
331332
grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);
332333

333334
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);

jenkins_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mkdir -p test_out
2828
grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color
2929

3030
# END TO END TESTS #
31-
grunt test:ci-protractor
31+
grunt test:ci-protractor-docs
3232

3333
# DOCS APP TESTS #
3434
grunt test:docs --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color

lib/grunt/plugins.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ module.exports = function(grunt) {
5757
util.updateWebdriver.call(util, this.async());
5858
});
5959

60-
grunt.registerMultiTask('protractor', 'Run Protractor integration tests', function() {
60+
grunt.registerMultiTask('protractor-docs', 'Run Protractor integration tests', function() {
6161
util.startProtractor.call(util, this.data, this.async());
6262
});
6363

scripts/travis/build.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ if [ $JOB = "unit" ]; then
99
grunt test:promises-aplus
1010
grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
1111
grunt tests:docs --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
12-
grunt test:travis-protractor --specs "docs/app/e2e/**/*.scenario.js"
12+
grunt test:travis-protractor-docs --specs "docs/app/e2e/**/*.scenario.js"
1313
elif [ $JOB = "e2e" ]; then
1414
export TARGET_SPECS="build/docs/ptore2e/**/default_test.js"
1515
if [ $TEST_TARGET = "jquery" ]; then
1616
TARGET_SPECS="build/docs/ptore2e/**/jquery_test.js"
1717
fi
18-
grunt test:travis-protractor --specs "$TARGET_SPECS"
18+
grunt test:travis-protractor-docs --specs "$TARGET_SPECS"
1919
else
2020
echo "Unknown job type. Please set JOB=unit or JOB=e2e-*."
2121
fi

0 commit comments

Comments
 (0)