tests cleanup: reenabled test, removed npm from CI commands (#1692)

* enabled install-import-pr-2, this feature has been implemented

* a better test fix

.travis.yml

@@ -55,4 +55,4 @@ os:
   #- osx
   - linux
 
-script: npm run $TEST_TYPE
+script: yarn $TEST_TYPE

__tests__/commands/add.js

@@ -238,8 +238,7 @@ test.concurrent('add with new dependency should be deterministic', (): Promise<v
   });
 });
 
-// TODO https://github.com/facebook/yarn/issues/79
-xit('add with new dependency should be deterministic 2', (): Promise<void> => {
+test.concurrent('add with new dependency should be deterministic 2', (): Promise<void> => {
   // [email protected]>[email protected] is saved in local mirror and is deduped
   // install [email protected] should replace [email protected] in root
 
@@ -275,7 +274,8 @@ xit('add with new dependency should be deterministic 2', (): Promise<void> => {
 
       const lockFileWritten = await fs.readFile(path.join(config.cwd, 'yarn.lock'));
       const lockFileLines = explodeLockfile(lockFileWritten);
-      assert.equal(lockFileLines.length, 8);
+      // see why we don't cleanup lockfile https://github.com/yarnpkg/yarn/issues/79
+      assert.equal(lockFileLines.length, 11);
 
       const mirror = await fs.walk(path.join(config.cwd, mirrorPath));
       assert.equal(mirror.length, 3);

__tests__/commands/install.js

@@ -538,8 +538,8 @@ test.concurrent('install should respect --no-bin-links flag', (): Promise<void>
 });
 
 
-xit('install should update a dependency to yarn and mirror (PR import scenario 2)', (): Promise<void> => {
-  // [email protected] is saved in local mirror and gets updated to [email protected] via
+test.concurrent('install should update a dependency to yarn and mirror (PR import scenario 2)', (): Promise<void> => {
+  // [email protected] is gets updated to [email protected] via
   // a change in package.json,
   // files in mirror, yarn.lock, package.json and node_modules should reflect that
 

__tests__/fixtures/request-cache/GET/localhost/.bin

@@ -1,5 +1,5 @@
 HTTP/1.1 200 OK
-Date: Fri, 04 Nov 2016 14:55:49 GMT
+Date: Fri, 04 Nov 2016 19:13:14 GMT
 Connection: close
 Content-Length: 2
 

circle.yml

@@ -32,10 +32,10 @@ test:
       if [ "$CIRCLE_BRANCH" == 'master' ]; then
         ./scripts/set-dev-version.js
       fi;
-    - npm run lint
-    - npm run test-ci
-    - npm run check-lockfile
-    - npm run build-dist
+    - yarn lint
+    - yarn test-ci
+    - yarn check-lockfile
+    - yarn build-dist
     - node ./scripts/build-webpack.js
     - ./scripts/build-deb.sh