chore(test): move beforeEach block into a describe block so it's not …

…executed globally
ui-router · Jan 5, 2017 · e659227 · e659227
1 parent f07b369
commit e659227
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/test/urlMatcherFactorySpec.ts b/test/urlMatcherFactorySpec.ts
@@ -7,15 +7,16 @@ var router: UIRouter;
 var $umf: UrlMatcherFactory;
 var $location: LocationServices;
 
-beforeEach(function() {
+function init() {
   router = new UIRouter();
   router.plugin(TestingPlugin);
   $umf = router.urlMatcherFactory;
   let locationPlugin = router.getPlugin('vanilla.memoryLocation') as LocationPlugin;
   $location = locationPlugin.service;
-});
+}
 
 describe("UrlMatcher", function () {
+  beforeEach(init);
 
   describe("provider", function () {
 
@@ -510,6 +511,8 @@ describe("UrlMatcher", function () {
 });
 
 describe("urlMatcherFactoryProvider", function () {
+  beforeEach(init);
+
   describe(".type()", function () {
     var m;
     beforeEach(function() {
@@ -535,6 +538,7 @@ describe("urlMatcherFactoryProvider", function () {
 });
 
 describe("urlMatcherFactory", function () {
+  beforeEach(init);
 
   it("compiles patterns", function () {
     var matcher = $umf.compile('/hello/world');

diff --git a/test/urlRouterSpec.ts b/test/urlRouterSpec.ts
@@ -120,21 +120,21 @@ describe("UrlRouter", function () {
 
   describe("location updates", function() {
     it('can push location changes', function () {
-      spyOn(router.locationService, "url");
+      spyOn(router.urlService, "url");
       urlRouter.push(matcher("/hello/:name"), { name: "world" });
-      expect(router.locationService.url).toHaveBeenCalledWith("/hello/world", undefined);
+      expect(router.urlService.url).toHaveBeenCalledWith("/hello/world", undefined);
     });
 
     it('can push a replacement location', function () {
-      spyOn(router.locationService, "url");
+      spyOn(router.urlService, "url");
       urlRouter.push(matcher("/hello/:name"), { name: "world" }, { replace: true });
-      expect(router.locationService.url).toHaveBeenCalledWith("/hello/world", true);
+      expect(router.urlService.url).toHaveBeenCalledWith("/hello/world", true);
     });
 
     it('can push location changes with no parameters', function () {
-      spyOn(router.locationService, "url");
+      spyOn(router.urlService, "url");
       urlRouter.push(urlMatcherFactory.compile("/hello/:name", { params: { name: "" } }));
-      expect(router.locationService.url).toHaveBeenCalledWith("/hello/", undefined);
+      expect(router.urlService.url).toHaveBeenCalledWith("/hello/", undefined);
     });
 
     it('can push location changes that include a #fragment', function () {