jest-jasmine1 && jest-jasmine2

Summary:(added by cpojer):
bypass-lint vendored files don't conform to our eslint standard
Closes jestjs#816

Differential Revision: D3096143

fb-gh-sync-id: 96e46ea39b13a2d4688d7e4f70382e00ac5784c9
fbshipit-source-id: 96e46ea39b13a2d4688d7e4f70382e00ac5784c9

Author: Dmitrii Abramov

.eslintignore

@@ -1,5 +1,5 @@
 bin/
 docs/
 **/node_modules/**
-vendor/
+**/vendor/**
 website/

package.json

@@ -9,6 +9,8 @@
     "diff": "^2.1.1",
     "graceful-fs": "^4.1.3",
     "istanbul": "^0.4.2",
+    "jest-jasmine1": "^9.0.3",
+    "jest-jasmine2": "^9.0.3",
     "jest-mock": "^9.0.3",
     "jest-util": "^9.0.3",
     "jsdom": "^7.2.0",

packages/jest-jasmine1/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "jest-jasmine1",
+  "version": "9.0.3",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/jest.git"
+  },
+  "license": "BSD-3-Clause",
+  "main": "src/index.js",
+  "dependencies": {
+    "graceful-fs": "^4.1.3",
+    "jest-util": "^9.0.3"
+  },
+  "scripts": {
+    "test": "../../bin/jest.js"
+  },
+  "jest": {
+    "testEnvironment": "<rootDir>/../../src/environments/NodeEnvironment"
+  }
+}

src/testRunners/jasmine/__tests__/JasmineReporter-test.js renamed to packages/jest-jasmine1/src/__tests__/reporter-test.js

@@ -20,7 +20,7 @@ describe('JasmineReporter', function() {
   var reporter;
 
   beforeEach(function() {
-    JasmineReporter = require('../JasmineReporter');
+    JasmineReporter = require('../reporter');
     chalk = require('chalk');
 
     reporter = new JasmineReporter();

src/testRunners/jasmine/jasmine1.js renamed to packages/jest-jasmine1/src/index.js

@@ -7,16 +7,14 @@
  */
 'use strict';
 
-const VENDOR_PATH = '../../../vendor/';
-const JASMINE_PATH = require.resolve(VENDOR_PATH + '/jasmine/jasmine-1.3.0');
-const JASMINE_ONLY_PATH =
-  require.resolve(VENDOR_PATH + '/jasmine-only/jasmine-only.js');
-
 const fs = require('graceful-fs');
-const jasminePit = require(VENDOR_PATH + '/jasmine-pit/jasmine-pit');
-const JasmineReporter = require('./JasmineReporter');
+const jasminePit = require('jest-util/lib/jasmine-pit');
+const JasmineReporter = require('./reporter');
 const path = require('path');
 
+const JASMINE_PATH = require.resolve('../vendor/jasmine-1.3.0');
+const JASMINE_ONLY_PATH = require.resolve('./jasmine-only.js');
+
 const jasmineFileContent = fs.readFileSync(JASMINE_PATH, 'utf8');
 const jasmineOnlyContent = fs.readFileSync(JASMINE_ONLY_PATH, 'utf8');
 

vendor/jasmine-only/jasmine-only.js renamed to packages/jest-jasmine1/src/jasmine-only.js

@@ -3,9 +3,8 @@
  * https://github.com/davemo/jasmine-only
  */
 (function() {
-  var __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
+  var __hasProp = {}.hasOwnProperty;
+  var __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; // eslint-disable-line
   (function(jasmine) {
     var describeOnly, env, itOnly, root;
     root = (1, eval)('this');
@@ -47,7 +46,7 @@
         declarationError = e;
       }
       if (declarationError) {
-        this.it("encountered a declaration exception", function() {
+        this.it('encountered a declaration exception', function() {
           throw declarationError;
         });
       }

src/testRunners/jasmine/JasmineReporter.js renamed to packages/jest-jasmine1/src/reporter.js

@@ -7,8 +7,8 @@
  */
 'use strict';
 
-const jasmine = require('../../../vendor/jasmine/jasmine-1.3.0').jasmine;
-const JasmineFormatter = require('./JasmineFormatter');
+const jasmine = require('../vendor/jasmine-1.3.0').jasmine;
+const JasmineFormatter = require('jest-util/lib/JasmineFormatter');
 
 class JasmineReporter extends jasmine.Reporter {
 

vendor/jasmine/jasmine-1.3.0.js renamed to packages/jest-jasmine1/vendor/jasmine-1.3.0.js

@@ -0,0 +1,20 @@
+{
+  "name": "jest-jasmine2",
+  "version": "9.0.3",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/jest.git"
+  },
+  "license": "BSD-3-Clause",
+  "main": "src/index.js",
+  "dependencies": {
+    "graceful-fs": "^4.1.3",
+    "jest-util": "^9.0.3"
+  },
+  "scripts": {
+    "test": "../../bin/jest.js"
+  },
+  "jest": {
+    "testEnvironment": "<rootDir>/../../src/environments/NodeEnvironment"
+  }
+}

packages/jest-jasmine2/package.json

@@ -17,7 +17,7 @@ describe('Jasmine2Reporter', function() {
   var reporter;
 
   beforeEach(function() {
-    JasmineReporter = require('../Jasmine2Reporter');
+    JasmineReporter = require('../reporter');
     chalk = require('chalk');
 
     reporter = new JasmineReporter();

src/testRunners/jasmine/__tests__/Jasmine2Reporter-test.js renamed to packages/jest-jasmine2/src/__tests__/reporter-test.js

@@ -7,14 +7,12 @@
  */
 'use strict';
 
-const VENDOR_PATH = '../../../vendor/';
-const JASMINE_PATH = require.resolve(VENDOR_PATH + '/jasmine/jasmine-2.3.4.js');
-
 const fs = require('graceful-fs');
-const jasminePit = require(VENDOR_PATH + '/jasmine-pit/jasmine-pit');
-const JasmineReporter = require('./Jasmine2Reporter');
+const jasminePit = require('jest-util/lib/jasmine-pit');
+const JasmineReporter = require('./reporter');
 const path = require('path');
 
+const JASMINE_PATH = require.resolve('../vendor/jasmine-2.3.4.js');
 const jasmineFileContent =
   fs.readFileSync(require.resolve(JASMINE_PATH), 'utf8');
 

src/testRunners/jasmine/jasmine2.js renamed to packages/jest-jasmine2/src/index.js

@@ -7,9 +7,9 @@
  */
 'use strict';
 
-const jasmineRequire = require('../../../vendor/jasmine/jasmine-2.3.4.js');
+const jasmineRequire = require('../vendor/jasmine-2.3.4.js');
 const jasmine = jasmineRequire.core(jasmineRequire);
-const JasmineFormatter = require('./JasmineFormatter');
+const JasmineFormatter = require('jest-util/lib/JasmineFormatter');
 
 class Jasmine2Reporter {
 

src/testRunners/jasmine/Jasmine2Reporter.js renamed to packages/jest-jasmine2/src/reporter.js

@@ -10,7 +10,7 @@
 
 const diff = require('diff');
 const chalk = require('chalk');
-const utils = require('jest-util');
+const utils = require('../index');
 
 const ERROR_TITLE_COLOR = chalk.bold.underline.red;
 const DIFFABLE_MATCHERS = Object.assign(Object.create(null), {

vendor/jasmine/jasmine-2.3.4.js renamed to packages/jest-jasmine2/vendor/jasmine-2.3.4.js

@@ -11,11 +11,8 @@
 
 jest.disableAutomock();
 
-const path = require('path');
-const VENDOR_PATH = path.resolve(__dirname, '../../../../vendor');
-
-const jasmine = require(`${VENDOR_PATH}/jasmine/jasmine-1.3.0`).jasmine;
-const jasmine2Require = require(`${VENDOR_PATH}/jasmine/jasmine-2.3.4.js`);
+const jasmine = require('jest-jasmine1/vendor/jasmine-1.3.0').jasmine;
+const jasmine2Require = require('jest-jasmine2/vendor/jasmine-2.3.4.js');
 const jasmine2 = jasmine2Require.core(jasmine2Require);
 
 const JasmineFormatter = require('../JasmineFormatter');

src/testRunners/jasmine/JasmineFormatter.js renamed to packages/jest-util/lib/JasmineFormatter.js

@@ -11,7 +11,7 @@
 
 jest.disableAutomock();
 
-const formatter = new (require('../JasmineFormatter'))(jasmine);
+const formatter = new (require('jest-util/lib/JasmineFormatter'))(jasmine);
 const CALLED_AT_LEAST_ONCE = 'Expected to be called at least once';
 const SHOULD_NOT_BE_CALLED = 'Expected not to be called';
 const NOT_EXPECTED_VALUES = (

src/testRunners/jasmine/__tests__/JasmineFormatter-test.js renamed to packages/jest-util/lib/__tests__/JasmineFormatter-test.js

@@ -77,9 +77,9 @@ function normalize(config, argv) {
   }
 
   if (config.testRunner === 'jasmine1') {
-    config.testRunner = require.resolve('../testRunners/jasmine/jasmine1');
+    config.testRunner = require.resolve('jest-jasmine1');
   } else if (!config.testRunner || config.testRunner === 'jasmine2') {
-    config.testRunner = require.resolve('../testRunners/jasmine/jasmine2');
+    config.testRunner = require.resolve('jest-jasmine2');
   } else {
     try {
       config.testRunner = path.resolve(

vendor/jasmine-pit/jasmine-pit.js renamed to packages/jest-util/lib/jasmine-pit.js

@@ -371,7 +371,7 @@ describe('utils-normalizeConfig', () => {
         rootDir: '/root/path/foo',
       });
 
-      expect(config.testRunner.endsWith('jasmine2.js')).toBe(true);
+      expect(config.testRunner).toMatch('jasmine2');
     });
 
     it('can be changed to jasmine1', () => {
@@ -380,7 +380,7 @@ describe('utils-normalizeConfig', () => {
         testRunner: 'jasmine1',
       });
 
-      expect(config.testRunner.endsWith('jasmine1.js')).toBe(true);
+      expect(config.testRunner).toMatch('jasmine1');
     });
 
     it('is overwritten by argv', () => {
@@ -393,7 +393,7 @@ describe('utils-normalizeConfig', () => {
         }
       );
 
-      expect(config.testRunner.endsWith('jasmine1.js')).toBe(true);
+      expect(config.testRunner).toMatch('jasmine1');
     });
   });