Test node in Windows as well

canjs · Sep 26, 2017 · d97dd7c · d97dd7c
1 parent 6203065
commit d97dd7c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -17,6 +17,7 @@ test_script:
   - node --version
   - npm --version
   # run tests
+  - npm run test:node
   - npm run test:win
 
 # Don't actually build.

diff --git a/package.json b/package.json
@@ -8,12 +8,8 @@
     "build": "node scripts/build.js",
     "document": "bit-docs",
     "test:node": "mocha test/test.js && mocha test/test_register_node.js",
-<<<<<<< HEAD
-    "test:browser": "DEBUG=testee:* testee test/test.html test/register.html --browsers firefox --reporter Spec",
-=======
     "test:browser": "testee test/test.html test/register.html --browsers firefox --reporter Spec",
-	"test:win": "testee test/test.html test/register.html --browsers firefox --reporter Spec",
->>>>>>> Make a test:win
+	"test:win": "testee test/test.html --browsers firefox --reporter Spec",
     "test:xss": "mocha test/xss/test.js",
     "test": "npm run test:node && npm run test:browser && npm run test:xss",
     "version": "git commit -am \"Update dist for release\" && git checkout -b release && git add -f dist/",