Merge branch 'master' into coverage-no-tests-warning

Author: rhysawilliams2010

.circleci/config.yml

@@ -42,7 +42,9 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn lint && yarn typecheck && yarn lint-es5-build && yarn lint:md:ci
+      - run: yarn lint --format junit -o reports/junit/js-lint-results.xml && yarn typecheck && yarn lint-es5-build --format junit -o reports/junit/js-es5-lint-results.xml  && yarn lint:md:ci
+      - store_test_results:
+          path: reports/junit
 
   test-browser:
     working_directory: ~/jest
@@ -64,7 +66,12 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn test-ci-partial
+      - run:
+          command: yarn test-ci-partial
+          environment:
+            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+      - store_test_results:
+                path: reports/junit
 
   test-node-9:
     working_directory: ~/jest
@@ -75,7 +82,11 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn test-ci-partial
+      - run:
+          command: yarn test-ci-partial
+          environment:
+            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+
 
   test-jest-circus:
     working_directory: ~/jest
@@ -86,7 +97,12 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: JEST_CIRCUS=1 yarn test-ci-partial
+      - run:
+          command: JEST_CIRCUS=1 yarn test-ci-partial
+          environment:
+            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+      - store_test_results:
+                path: reports/junit
 
   test-node-8:
     working_directory: ~/jest
@@ -97,7 +113,12 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn test-ci
+      - run:
+          command: yarn test-ci
+          environment:
+            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+      - store_test_results:
+                path: reports/junit
 
   test-node-6:
     working_directory: ~/jest
@@ -108,7 +129,12 @@ jobs:
       - restore-cache: *restore-cache
       - run: yarn --no-progress
       - save-cache: *save-cache
-      - run: yarn test-ci-partial
+      - run:
+          command: yarn test-ci-partial
+          environment:
+            JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml"
+      - store_test_results:
+                path: reports/junit
 
   test-and-deploy-website:
     working_directory: ~/jest

.eslintrc.js

@@ -44,7 +44,7 @@ module.exports = {
       },
     },
     {
-      files: ['scripts/**/*', 'integration-tests/**/*'],
+      files: ['scripts/**/*', 'e2e/**/*'],
       rules: {
         'babel/func-params-comma-dangle': 0,
       },
@@ -56,14 +56,11 @@ module.exports = {
       },
     },
     {
-      excludedFiles: [
-        'integration-tests/__tests__/**/*',
-        'website/versioned_docs/**/*.md',
-      ],
+      excludedFiles: ['e2e/__tests__/**/*', 'website/versioned_docs/**/*.md'],
       files: [
         'examples/**/*',
         'scripts/**/*',
-        'integration-tests/*/**/*',
+        'e2e/*/**/*',
         'website/*/**/*',
         'eslintImportResolver.js',
       ],
@@ -81,7 +78,7 @@ module.exports = {
     },
     {
       files: [
-        'integration-tests/__tests__/**/*',
+        'e2e/__tests__/**/*',
         'packages/babel-jest/**/*.test.js',
         'packages/babel-plugin-jest-hoist/**/*.test.js',
         'packages/babel-preset-jest/**/*.test.js',
@@ -103,7 +100,7 @@ module.exports = {
       files: [
         'website/**',
         '**/__tests__/**',
-        'integration-tests/**',
+        'e2e/**',
         '**/pretty-format/perf/**',
       ],
       rules: {