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

Commit 9e68bab

Browse files
committed
WIP: fix .jshintrc files and add test:e2e task for the basic e2e tests
1 parent 061f178 commit 9e68bab

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

Gruntfile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,8 @@ module.exports = function(grunt) {
334334
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
335335
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
336336
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
337+
grunt.registerTask('test:e2e', 'Run E2E tests with Protractor with a test server running in the background',
338+
['webdriver', 'connect:testserver', 'protractor:normal']);
337339
grunt.registerTask('test:protractor-docs', 'Run the end to end docs tests with Protractor and keep a test server running in the background',
338340
['webdriver', 'connect:testserver', 'protractor-docs:normal']);
339341
grunt.registerTask('test:travis-protractor-docs', 'Run the end to end docs tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor-docs:travis']);

test/e2e/fixtures/.jshintrc

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
{
2-
"node": true,
2+
"browser": true,
33
"globals": {
4-
"describe": false,
5-
"ddescribe": false,
6-
"xdescribe": false,
7-
"it": false,
8-
"xit": false,
9-
"iit": false,
4+
"angular": false,
5+
"jQuery": false,
6+
"$": false
107
}
118
}

test/e2e/tests/.jshintrc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
2-
"browser": true,
2+
"node": true,
33
"globals": {
4-
"angular": false,
5-
"jQuery": false,
6-
"$": false
4+
"describe": false,
5+
"ddescribe": false,
6+
"xdescribe": false,
7+
"it": false,
8+
"xit": false,
9+
"iit": false
710
}
811
}

0 commit comments

Comments
 (0)