Merge branch 'lab-02-first-component-solved' into lab-03-routing-start

* lab-02-first-component-solved: switching to karma-browserify and removing protractor
improving-minnesota · Aug 11, 2015 · 2ae10ea · 2ae10ea
2 parents 6408cbf + 09c5d37
commit 2ae10ea
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/package.json b/package.json
@@ -82,7 +82,7 @@
     "gulp-util": "^3.0.3",
     "gulp-watch": "^4.1.1",
     "karma": "^0.13.8",
-    "karma-bro": "^0.11.1",
+    "karma-browserify": "^4.3.0",
     "karma-chrome-launcher": "^0.2.0",
     "karma-firefox-launcher": "^0.1.4",
     "karma-mocha": "^0.2.0",
@@ -91,7 +91,6 @@
     "lazypipe": "^1.0.1",
     "merge-stream": "^0.1.7",
     "mocha": "^2.2.1",
-    "protractor": "^2.1.0",
     "proxyquire": "^1.4.0",
     "proxyquire-universal": "^1.0.3",
     "proxyquireify": "^3.0.0",