summaryrefslogtreecommitdiffstats
path: root/js/tests
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2014-05-26 02:41:01 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2014-05-26 02:41:01 +0200
commitb91ef01fdbf14c6a5d58e5c471dbb1fc9d17cdfb (patch)
treefe42125d4dd2700bed45d99b7a5c2a34ddc0f4ab /js/tests
parent6dc363a14a1d2b09d72a3f0d3e7bdfd362bad41c (diff)
use controller as syntax for ng-view
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/unit/controller/ContentControllerSpec.js14
1 files changed, 3 insertions, 11 deletions
diff --git a/js/tests/unit/controller/ContentControllerSpec.js b/js/tests/unit/controller/ContentControllerSpec.js
index 94cb09f21..ac7c6f1a8 100644
--- a/js/tests/unit/controller/ContentControllerSpec.js
+++ b/js/tests/unit/controller/ContentControllerSpec.js
@@ -10,16 +10,11 @@
describe('ContentController', () => {
'use strict';
- let scope;
beforeEach(module('News', ($provide) => {
$provide.value('BASE_URL', 'base');
}));
- beforeEach(inject(($rootScope) => {
- scope = $rootScope.$new();
- }));
-
it('should publish data to models', inject(($controller, Publisher,
FeedResource, ItemResource) => {
@@ -34,7 +29,6 @@ describe('ContentController', () => {
{id: 4}
]
},
- $scope: scope
});
expect(controller.getItems().length).toBe(2);
@@ -48,7 +42,6 @@ describe('ContentController', () => {
$controller('ContentController', {
data: {},
- $scope: scope
});
expect(ItemResource.clear).toHaveBeenCalled();
@@ -58,17 +51,16 @@ describe('ContentController', () => {
it('should return order by', inject(($controller,
SettingsResource) => {
- $controller('ContentController', {
+ let ctrl = $controller('ContentController', {
SettingsResource: SettingsResource,
- $scope: scope,
data: {},
});
- expect(scope.Content.orderBy()).toBe('id');
+ expect(ctrl.orderBy()).toBe('id');
SettingsResource.set('oldestFirst', true);
- expect(scope.Content.orderBy()).toBe('-id');
+ expect(ctrl.orderBy()).toBe('-id');
}));
});