WIP: fix .jshintrc files and add test:e2e task for the basic e2e tests

angular · caitp · Oct 10, 2014 · Oct 15, 2014 · Oct 15, 2014 · Oct 15, 2014
commit 9e68babf030c69f05ce92604807bf8c1f732325c
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -334,6 +334,8 @@ module.exports = function(grunt) {
   grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
   grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
  grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
+  grunt.registerTask('test:e2e', 'Run E2E tests with Protractor with a test server running in the background',
+                     ['webdriver', 'connect:testserver', 'protractor:normal']);
   grunt.registerTask('test:protractor-docs', 'Run the end to end docs tests with Protractor and keep a test server running in the background',
                      ['webdriver', 'connect:testserver', 'protractor-docs:normal']);
   grunt.registerTask('test:travis-protractor-docs', 'Run the end to end docs tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor-docs:travis']);

diff --git a/test/e2e/fixtures/.jshintrc b/test/e2e/fixtures/.jshintrc
@@ -1,11 +1,8 @@
 {
-  "node": true,
+  "browser": true,
   "globals": {
-    "describe": false,
-    "ddescribe": false,
-    "xdescribe": false,
-    "it": false,
-    "xit": false,
-    "iit": false,
+    "angular": false,
+    "jQuery": false,
+    "$": false
   }
 }
diff --git a/test/e2e/tests/.jshintrc b/test/e2e/tests/.jshintrc
@@ -1,8 +1,11 @@
 {
-  "browser": true,
+  "node": true,
   "globals": {
-    "angular": false,
-    "jQuery": false,
-    "$": false
+    "describe": false,
+    "ddescribe": false,
+    "xdescribe": false,
+    "it": false,
+    "xit": false,
+    "iit": false
   }
 }