Merge pull request #2612 from twolfson/dev/ignore.console.log.sqwished

chore: relocate console.log test file into test/e2e and ignore it
karma-runner · Mar 20, 2017 · f567e20 · f567e20
2 parents 0eb8dd9 + 433855a
commit f567e20
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@ tmp/*
 docs/_build
 *.swp
 *.swo
+test/e2e/console.log
 test/e2e/coverage/coverage
 test/e2e/coverageQunit/coverage
 test/e2e/coverageRequirejs/coverage

diff --git a/console.log b/console.log
diff --git a/test/e2e/browser_console.feature b/test/e2e/browser_console.feature
@@ -53,12 +53,12 @@ Feature: Browser Console Configuration
         'karma-phantomjs-launcher'
       ];
       browserConsoleLogOptions = {
-        path: 'console.log',
+        path: 'test/e2e/console.log',
         format: '%t:%m'
       };
       """
     When I start Karma
-    Then the file at console.log contains:
+    Then the file at test/e2e/console.log contains:
       """
       log:'foo'
       debug:'bar'
@@ -77,12 +77,12 @@ Feature: Browser Console Configuration
         'karma-phantomjs-launcher'
       ];
       browserConsoleLogOptions = {
-        path: 'console.log',
+        path: 'test/e2e/console.log',
         format: '%t:%T:%m'
       };
       """
     When I start Karma
-    Then the file at console.log contains:
+    Then the file at test/e2e/console.log contains:
       """
       log:LOG:'foo'
       debug:DEBUG:'bar'
@@ -101,13 +101,13 @@ Feature: Browser Console Configuration
         'karma-phantomjs-launcher'
       ];
       browserConsoleLogOptions = {
-        path: 'console.log',
+        path: 'test/e2e/console.log',
         format: '%t:%T:%m',
         level: 'warn'
       };
       """
     When I start Karma
-    Then the file at console.log contains:
+    Then the file at test/e2e/console.log contains:
       """
       log:LOG:'foo'
       warn:WARN:'foobar'
@@ -124,12 +124,12 @@ Feature: Browser Console Configuration
         'karma-phantomjs-launcher'
       ];
       browserConsoleLogOptions = {
-        path: 'console.log',
+        path: 'test/e2e/console.log',
         format: '%b'
       };
       """
     When I start Karma
-    Then the file at console.log contains:
+    Then the file at test/e2e/console.log contains:
       """
       Phantom
       """
@@ -144,7 +144,7 @@ Feature: Browser Console Configuration
         'karma-phantomjs-launcher'
       ];
       browserConsoleLogOptions = {
-        path: 'console.log',
+        path: 'test/e2e/console.log',
         format: '%b',
         terminal: false
       };