Pass tests

Author: Nick Litwin

app/services/helpers.service.js

@@ -165,8 +165,9 @@
 
     function redirectPostLogin(nextParam) {
       // make sure domain is topcoder | dev | qa
-      var re1 = /^(\w+\.)*topcoder(-\w+)*\.com/,
-        re2 = /^\/\w+/;
+      var re1 = /^(\w+\.)*topcoder(-\w+)*\.com/;
+      var re2 = /^\/\w+/;
+
       if (re1.test(nextParam)) {
         $window.location.href = decodeURIComponent(nextParam);
       } else if (re2.test(nextParam)) {

app/services/helpers.service.spec.js

@@ -1,37 +1,34 @@
 /* jshint -W117, -W030 */
 describe('Helper Service', function() {
 
-  var service;
-
+  var fakeWindow = {
+    location: {
+      href: "/"
+    }
+  };
 
   beforeEach(function() {
-    bard.appModule('tc.services', bard.fakeStateProvider);
-    bard.inject(this, '$window',  '$location', 'Helpers');
-
-    bard.mockService($window, {
-      location: {
-        href: "/"
-      }
+    bard.appModule('tc.services', function($provide) {
+      $provide.value('$window', fakeWindow);
     });
 
-    service = Helpers;
+    bard.inject(this, 'Helpers');
   });
 
-  describe("Verify isEmail()", function() {
+  describe("isEmail()", function() {
     it('should should return true for "[email protected]"', function() {
-      expect(service.isEmail("[email protected]")).to.be(true);
+      expect(Helpers.isEmail("[email protected]")).to.be.true;
     });
 
     it('should should return false for "test123"', function() {
-      expect(service.isEmail("test123")).to.be(false);
+      expect(Helpers.isEmail("test123")).to.be.false;
     });
   });
 
-  describe("Verify redirectPostLogin()", function() {
-    it("should redirect to my-dashboard", function() {
-      service.redirectPostLogin(encodeURIComponent("http://www.topcoder-dev.com"));
-      expect($window.location.href).to.equal("http://www.topcoder-dev.com");
+  describe("redirectPostLogin()", function() {
+    it("should redirect to the next param", function() {
+      Helpers.redirectPostLogin(encodeURIComponent("www.topcoder-dev.com"));
+      expect(fakeWindow.location.href).to.equal("www.topcoder-dev.com");
     });
   });
-
 });

app/specs.html

@@ -156,10 +156,11 @@ <h1><a href="specs.html">Spec Runner</a></h1>
     <script src="/app/my-dashboard/my-dashboard.spec.js"></script>
     <script src="/app/profile/profile.controller.spec.js"></script>
     <script src="/app/services/challenge.service.spec.js"></script>
+    <script src="/app/services/helpers.service.spec.js"></script>
     <script src="/app/services/profile.service.spec.js"></script>
-    <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
     <script src="/app/account/login/login.spec.js"></script>
     <script src="/app/account/register/register.spec.js"></script>
+    <script src="/app/blocks/exception/exception-handler.provider.spec.js"></script>
     <script src="/app/directives/challenge-tiles/challenge-tile.spec.js"></script>
     <script src="/app/my-dashboard/community-updates/community-updates.spec.js"></script>
     <script src="/app/my-dashboard/my-challenges/my-challenges.spec.js"></script>