diff options
| author | Misko Hevery | 2012-05-18 15:26:09 -0700 |
|---|---|---|
| committer | Misko Hevery | 2012-06-02 14:51:03 -0700 |
| commit | 8aa18f0ad036fd4f2dc26f54d80754c70232b4f7 (patch) | |
| tree | cc2eecd0b7a252ae372bc6c67605ae970984262a /test/ng/locationSpec.js | |
| parent | 85632cb44c95617d73c369f3a03fb476a4d5c8a2 (diff) | |
| download | angular.js-8aa18f0ad036fd4f2dc26f54d80754c70232b4f7.tar.bz2 | |
chore($location) switch to use $rootElement
Diffstat (limited to 'test/ng/locationSpec.js')
| -rw-r--r-- | test/ng/locationSpec.js | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/test/ng/locationSpec.js b/test/ng/locationSpec.js index b866b1e3..46079ea6 100644 --- a/test/ng/locationSpec.js +++ b/test/ng/locationSpec.js @@ -498,8 +498,8 @@ describe('$location', function() { // html5 history enabled, but not supported by browser describe('history on old browser', function() { - afterEach(inject(function($document){ - dealoc($document); + afterEach(inject(function($rootElement){ + dealoc($rootElement); })); it('should use hashbang url with hash prefix', function() { @@ -532,8 +532,8 @@ describe('$location', function() { // html5 history enabled and supported by browser describe('history on new browser', function() { - afterEach(inject(function($document){ - dealoc($document); + afterEach(inject(function($rootElement){ + dealoc($rootElement); })); it('should use new url', function() { @@ -681,7 +681,6 @@ describe('$location', function() { function configureService(linkHref, html5Mode, supportHist, attrs, content) { module(function($provide, $locationProvider) { - var jqRoot = jqLite('<div></div>'); attrs = attrs ? ' ' + attrs + ' ' : ''; // fake the base behavior @@ -692,14 +691,16 @@ describe('$location', function() { } link = jqLite('<a href="' + linkHref + '"' + attrs + '>' + content + '</a>')[0]; - root = jqRoot.append(link)[0]; - jqLite(document.body).append(jqRoot); - - $provide.value('$document', jqRoot); $provide.value('$sniffer', {history: supportHist}); $locationProvider.html5Mode(html5Mode); $locationProvider.hashPrefix('!'); + return function($rootElement, $document) { + $rootElement.append(link); + root = $rootElement[0]; + // we need to do this otherwise we can't simulate events + $document.find('body').append($rootElement); + }; }); } @@ -711,11 +712,11 @@ describe('$location', function() { } function initLocation() { - return function($browser, $location, $document) { + return function($browser, $location, $rootElement) { originalBrowser = $browser.url(); // we have to prevent the default operation, as we need to test absolute links (http://...) // and navigating to these links would kill jstd - $document.bind('click', function(e) { + $rootElement.bind('click', function(e) { lastEventPreventDefault = e.isDefaultPrevented(); e.preventDefault(); }); |
