Updated protractor tests and fixed proxy re SchizoDuckie#248

Author: SchizoDuckie

tests/Favorites.js

@@ -12,12 +12,21 @@ function Favorites() {
         return element(by.css('series-list'));
     };
 
-    this.getSearchResults = function(cb) {
+    this.getSearchResults = function() {
         return element.all(by.css('series-list serieheader')).then(function(elements) {
             return elements;
         });
     };
 
+    this.getDoctorWhoAddingEarmark = function() {
+        return element(by.css('series-list serieheader:nth-child(3) em.earmark.adding'));
+    };
+
+
+    this.getDoctorWhoAddedEarmark = function() {
+        return element(by.cssContainingText('series-list serieheader:nth-child(3) em.earmark', '✓'));
+    };
+
     /*
 
     this.getAddSampleButton = function() {

tests/proxy.php

@@ -9,7 +9,7 @@
 
 
 // if there's a cached version of this request in fixtures, serve it.
-$cache = dirname(__FILE__).'/tests/fixtures/'.sha1($_GET['url']).'.json'; 
+$cache = dirname(__FILE__).'/fixtures/'.sha1($_GET['url']).'.json'; 
 if(file_exists($cache)) {
     $out = json_decode(file_get_contents($cache),true);
     foreach($out['headers'] as $key=>$val) {

tests/test-main.js

@@ -0,0 +1,24 @@
+var allTestFiles = [];
+var TEST_REGEXP = /(spec|test)\.js$/i;
+
+var pathToModule = function(path) {
+  return path.replace(/^\/base\//, '').replace(/\.js$/, '');
+};
+
+Object.keys(window.__karma__.files).forEach(function(file) {
+  if (TEST_REGEXP.test(file)) {
+    // Normalize paths to RequireJS module names.
+    allTestFiles.push(pathToModule(file));
+  }
+});
+
+require.config({
+  // Karma serves files under /base, which is the basePath from your config file
+  baseUrl: '/base',
+
+  // dynamically load all test files
+  deps: allTestFiles,
+
+  // we have to kickoff jasmine, as it is asynchronous
+  callback: window.__karma__.start
+});