support running e2e tests in a dev environment where bit command is… (

#170)

* support running e2e tests in a dev environment where `bit` command is different (such as bit-dev)

* e2e: make sure the bit-javascript driver is the one used in bit-bin and not an outdated one

CHANGELOG.md

@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [unreleased]
 
+- support running e2e tests in a dev environment where `bit` command is different (such as bit-dev) 
 - `bit import` no longer uses the internal cache objects to retrieve remote bit-components.
 - avoid corrupted data in a scope when dependencies somehow are not being resolved.
 - allow `bit init` when there is a bit.json file without the `source` or `env` attributes.

CONTRIBUTING.md

@@ -73,11 +73,16 @@ npm install -g flow-bin flow-typed
   npm test
 ```
 
-- run the e2e tests
+- run the e2e tests (with default 'bit' command)
 ```bash
   npm run e2e-test
 ```
 
+- run e2e tests using bit-dev command
+```bash
+  npm run e2e-test --bit_bin=bit-dev
+```
+
 ### lint
 
 - run eslint

e2e/e2e-helper.js

@@ -12,9 +12,11 @@ export default class Helper {
     this.e2eDir = path.join(os.tmpdir(), 'bit', 'e2e');
     this.localScopePath = path.join(this.e2eDir, this.localScope);
     this.remoteScopePath = path.join(this.e2eDir, this.remoteScope);
+    this.bitBin = process.env.npm_config_bit_bin || 'bit'; // e.g. npm run e2e-test --bit_bin=bit-dev
   }
 
   runCmd(cmd, cwd = this.localScopePath) {
+    if (cmd.startsWith('bit ')) cmd = cmd.replace('bit', this.bitBin);
     if (this.verbose) console.log('running: ', cmd); // eslint-disable-line
     const cmdOutput = childProcess.execSync(cmd, { cwd });
     if (this.verbose) console.log(cmdOutput.toString()); // eslint-disable-line

e2e/hooks/javascript-hooks.e2e.js

@@ -31,8 +31,11 @@ function expectLinksInRootLevel() {
 describe('javascript-hooks', function () {
   this.timeout(0);
   before(() => {
-    helper.runCmd('npm init -y', helper.e2eDir);
-    helper.runCmd('npm install bit-javascript', helper.e2eDir);
+    // makes sure the bit-javascript driver is the one used in bit-bin and not an outdated one
+    const bitJavascriptPath = fs.realpathSync(path.join(process.cwd(), 'node_modules', 'bit-javascript'));
+    const destPath = path.join(helper.e2eDir, 'node_modules', 'bit-javascript');
+    fs.removeSync(destPath);
+    fs.ensureSymlinkSync(bitJavascriptPath, destPath);
   });
   after(() => {
     helper.destroyEnv();

package.json

@@ -9,7 +9,7 @@
     "lint": "gulp lint && flow check",
     "test": "gulp test",
     "postinstall": "bitjs import",
-    "e2e-test": "gulp e2e-test",
+    "e2e-test": "mocha --compilers js:babel-core/register ./e2e/**/*.e2e.js",
     "build": "babel src specs -d dist",
     "watch": "babel watch bin src specs -d dist --source-maps",
     "build-debug": "babel src specs -d dist --source-maps",