Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
test: rename / remove duplicate unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
vojtajina committed Aug 23, 2013
1 parent eefcdad commit b89a4e4
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 85 deletions.
4 changes: 2 additions & 2 deletions test/AngularSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ describe('angular', function() {
expect(dst.a).not.toBe(src.a);
});

it("should deeply copy an object into an existing object", function() {
it("should deeply copy an object into a non-existing object", function() {
var src = {a:{name:"value"}};
var dst = copy(src, dst);
var dst = copy(src, undefined);
expect(src).toEqual({a:{name:"value"}});
expect(dst).toEqual(src);
expect(dst).not.toBe(src);
Expand Down
57 changes: 6 additions & 51 deletions test/ng/compileSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1488,16 +1488,6 @@ describe('$compile', function() {
);


it('should not allow more then one isolate scope creation per element', inject(
function($rootScope, $compile) {
expect(function(){
$compile('<div class="iscope-a; iscope-b"></div>');
}).toThrowMinErr('$compile', 'multidir', 'Multiple directives [iscopeA, iscopeB] asking for isolated scope on: ' +
'<div class="iscope-a; iscope-b ng-isolate-scope ng-scope">');
})
);


it('should create new scope even at the root of the template', inject(
function($rootScope, $compile, log) {
element = $compile('<div scope-a></div>')($rootScope);
Expand Down Expand Up @@ -1824,24 +1814,6 @@ describe('$compile', function() {
});
});

it('should allow setting of attributes', function() {
module(function() {
directive({
setter: valueFn(function(scope, element, attr) {
attr.$set('name', 'abc');
attr.$set('disabled', true);
expect(attr.name).toBe('abc');
expect(attr.disabled).toBe(true);
})
});
});
inject(function($rootScope, $compile) {
element = $compile('<div setter></div>')($rootScope);
expect(element.attr('name')).toEqual('abc');
expect(element.attr('disabled')).toEqual('disabled');
});
});


it('should create new instance of attr for each template stamping', function() {
module(function($provide) {
Expand Down Expand Up @@ -2055,32 +2027,15 @@ describe('$compile', function() {

$rootScope.name = 'misko';
$rootScope.$apply();
expect(componentScope.ref).toBe($rootScope.name);
expect(componentScope.refAlias).toBe($rootScope.name);

$rootScope.name = {};
$rootScope.$apply();
expect(componentScope.ref).toBe($rootScope.name);
expect(componentScope.refAlias).toBe($rootScope.name);
}));


it('should update local when origin changes', inject(function() {
compile('<div><span my-component ref="name">');
expect(componentScope.ref).toBe(undefined);
expect(componentScope.refAlias).toBe(componentScope.ref);

componentScope.ref = 'misko';
$rootScope.$apply();
expect($rootScope.name).toBe('misko');
expect(componentScope.ref).toBe('misko');
expect($rootScope.name).toBe(componentScope.ref);
expect(componentScope.refAlias).toBe(componentScope.ref);
expect(componentScope.refAlias).toBe('misko');

componentScope.name = {};
$rootScope.name = {};
$rootScope.$apply();
expect($rootScope.name).toBe(componentScope.ref);
expect(componentScope.refAlias).toBe(componentScope.ref);
expect(componentScope.ref).toBe($rootScope.name);
expect(componentScope.refAlias).toBe($rootScope.name);
}));


Expand Down Expand Up @@ -3379,7 +3334,7 @@ describe('$compile', function() {
}));


it('should group on nested groups', inject(function($compile, $rootScope) {
it('should group on nested groups of same directive', inject(function($compile, $rootScope) {
$rootScope.show = false;
element = $compile(
'<div></div>' +
Expand Down Expand Up @@ -3427,7 +3382,7 @@ describe('$compile', function() {
});


it('should throw error if unterminated', function () {
it('should throw error if unterminated (containing termination as a child)', function () {
module(function($compileProvider) {
$compileProvider.directive('foo', function() {
return {
Expand Down
2 changes: 1 addition & 1 deletion test/ng/httpBackendSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ describe('$httpBackend', function() {
});


it('should convert 0 to 200 if content - relative url', function() {
it('should convert 0 to 404 if no content - relative url', function() {
$backend = createHttpBackend($browser, MockXhr, null, null, null, 'file');

$backend('GET', '/whatever/index.html', null, callback);
Expand Down
13 changes: 1 addition & 12 deletions test/ng/parseSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -717,17 +717,6 @@ describe('parser', function() {
});


it('should call the function once when it is not part of the context', function() {
var count = 0;
scope.fn = function() {
count++;
return function() { return 'lucas'; };
};
expect(scope.$eval('fn()()')).toBe('lucas');
expect(count).toBe(1);
});


it('should call the function once when it is part of the context on assignments', function() {
var count = 0;
var element = {};
Expand Down Expand Up @@ -766,7 +755,7 @@ describe('parser', function() {
});


it('should call the function once when it is part of the context on array lookup function', function() {
it('should call the function once when it is part of the context on property lookup function', function() {
var count = 0;
var element = {name: {anotherFn: function() { return 'lucas';} } };
scope.fn = function() {
Expand Down
9 changes: 0 additions & 9 deletions test/ng/qSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1467,15 +1467,6 @@ describe('q', function() {
});


it('should still reject the promise, when exception is thrown in success handler, even if exceptionHandler rethrows', function() {
deferred.promise.then(function() { throw 'reject'; }).then(null, errorSpy);
deferred.resolve('resolve');
mockNextTick.flush();
expect(exceptionExceptionSpy).toHaveBeenCalled();
expect(errorSpy).toHaveBeenCalled();
});


it('should still reject the promise, when exception is thrown in success handler, even if exceptionHandler rethrows', function() {
deferred.promise.then(null, function() { throw 'reject again'; }).then(null, errorSpy);
deferred.reject('reject');
Expand Down
4 changes: 0 additions & 4 deletions test/ng/sceSpecs.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,6 @@ describe('SCE', function() {
expect($sce.trustAsHtml("")).toBe("");
}));

it('should unwrap null into null', inject(function($sce) {
expect($sce.getTrusted($sce.HTML, null)).toBe(null);
}));

it('should unwrap "" into ""', inject(function($sce) {
expect($sce.getTrusted($sce.HTML, "")).toBe("");
}));
Expand Down
10 changes: 5 additions & 5 deletions test/ngMock/angular-mocksSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ describe('ngMock', function() {
$log.reset();
}));

it("should skip debugging output if disabled", inject(function($log) {
it("should skip debugging output if disabled (" + debugEnabled + ")", inject(function($log) {
$log.log('fake log');
$log.info('fake log');
$log.warn('fake log');
Expand Down Expand Up @@ -197,19 +197,19 @@ describe('ngMock', function() {
$log.reset();
}));

it('should provide the debug method', function() {
it('should provide the log method', function() {
expect(function() { $log.log(''); }).not.toThrow();
});

it('should provide the debug method', function() {
it('should provide the info method', function() {
expect(function() { $log.info(''); }).not.toThrow();
});

it('should provide the debug method', function() {
it('should provide the warn method', function() {
expect(function() { $log.warn(''); }).not.toThrow();
});

it('should provide the debug method', function() {
it('should provide the error method', function() {
expect(function() { $log.error(''); }).not.toThrow();
});

Expand Down
2 changes: 1 addition & 1 deletion test/ngResource/resourceSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -797,7 +797,7 @@ describe("resource", function() {
});


it('should call the error callback if provided on non 2xx response', function() {
it('should call the error callback if provided on non 2xx response (without data)', function() {
$httpBackend.expect('GET', '/CreditCard').respond(ERROR_CODE, ERROR_RESPONSE);

CreditCard.get(callback, errorCB);
Expand Down

0 comments on commit b89a4e4

Please sign in to comment.