Skip to content

Commit 82db1a1

Browse files
bugthesystembugthesystem
committed
rename controller suffix from Ctrl to Controller
1 parent a232b8e commit 82db1a1

8 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎app/app.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import 'angular-animate';
1111
import '../bower_components/angular-seo/angular-seo';
1212

1313
import config from './app.config';
14-
import LayoutCtrl from './layout/layout.controller.js';
14+
import LayoutController from './layout/layout.controller.js';
1515

1616
import home from './messages';
1717
import common from './common';
1818

1919
angular.module('espackApp', [uirouter, home, common, 'templates', 'seo'])
2020
.config(config)
21-
.controller('LayoutCtrl', LayoutCtrl);
21+
.controller('LayoutController', LayoutController);

‎app/layout/layout.controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import angular from 'angular';
22

3-
export default class LayoutCtrl {
3+
export default class LayoutController {
44
constructor($scope) {
55
this.pageTitle = 'AngularJS + ES6 application using Webpack';
66

@@ -12,4 +12,4 @@ export default class LayoutCtrl {
1212
}
1313
}
1414

15-
LayoutCtrl.$inject = ['$scope'];
15+
LayoutController.$inject = ['$scope'];

‎app/messages/index.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import uirouter from 'angular-ui-router';
33

44
import config from './messages.config';
55

6-
import MessagesCtrl from './messages.controller.js';
6+
import MessagesController from './messages.controller.js';
77
import MessageList from './../components/message-list.directive.js';
88
import MessageService from './../services/message.service.js';
99

1010
export default angular.module('espackApp.messages', [uirouter])
1111
.config(config)
12-
.controller('MessagesCtrl', MessagesCtrl)
12+
.controller('MessagesController', MessagesController)
1313
.service('messageService', MessageService)
1414
.directive('messageList', ()=>new MessageList)
1515
.name;

‎app/messages/messages.config.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
url: '/',
44
views: {
55
main: {
6-
controller: 'MessagesCtrl',
6+
controller: 'MessagesController',
77
templateUrl: 'messages/list.html',
88
controllerAs: 'vm'
99
}

‎app/messages/messages.controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default class MessagesCtrl {
1+
export default class MessagesController {
22
constructor($scope, logger, messageService) {
33
this.messages = [];
44
this.messageService = messageService;
@@ -23,4 +23,4 @@
2323
}
2424
}
2525

26-
MessagesCtrl.$inject = ['$scope', 'logger', 'messageService'];
26+
MessagesController.$inject = ['$scope', 'logger', 'messageService'];

‎public/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html ng-app="espackApp" ng-controller="LayoutCtrl as appVm" ng-strict-di>
2+
<html ng-app="espackApp" ng-controller="LayoutController as appVm" ng-strict-di>
33
<head>
44

55
<meta charset="utf-8"/>

‎tests/layout/layout-controller.spec.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
describe('LayoutCtrl', ()=> {
1+
describe('LayoutController', ()=> {
22

3-
let LayoutCtrl, mock, rootScope, controllerFactory;
3+
let LayoutController, mock, rootScope, controllerFactory;
44

55
const pageTitleSuffix = ' | AngularJS + ES6 application using Webpack';
66

@@ -13,13 +13,13 @@
1313
});
1414

1515
it('should exist', ()=> {
16-
LayoutCtrl = controllerFactory('LayoutCtrl', mock);
17-
expect(!!LayoutCtrl).toBe(true);
16+
LayoutController = controllerFactory('LayoutController', mock);
17+
expect(!!LayoutController).toBe(true);
1818
});
1919

2020
it('should define pageTitle property', ()=> {
21-
LayoutCtrl = controllerFactory('LayoutCtrl', mock);
22-
expect(LayoutCtrl.pageTitle).toBeDefined();
21+
LayoutController = controllerFactory('LayoutController', mock);
22+
expect(LayoutController.pageTitle).toBeDefined();
2323
});
2424

2525
it('should set pageTitle by handling $stateChangeSuccess event', function () {
@@ -28,10 +28,10 @@
2828
data: {pageTitle: 'TEST'}
2929
};
3030

31-
LayoutCtrl = controllerFactory('LayoutCtrl', mock);
31+
LayoutController = controllerFactory('LayoutController', mock);
3232
rootScope.$broadcast('$stateChangeSuccess', stateData);
3333

34-
expect(LayoutCtrl.pageTitle).toBe(stateData.data.pageTitle + pageTitleSuffix)
34+
expect(LayoutController.pageTitle).toBe(stateData.data.pageTitle + pageTitleSuffix)
3535
});
3636
});
3737

‎tests/messages/messages-controller.spec.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
describe('MessagesCtrl', ()=> {
1+
describe('MessagesController', ()=> {
22

33
let homeCtrl, mock, deferredResolution, rootScope, controllerFactory,
44
mockData = [
@@ -17,12 +17,12 @@
1717
});
1818

1919
it('should exist', ()=> {
20-
homeCtrl = controllerFactory('MessagesCtrl', mock);
20+
homeCtrl = controllerFactory('MessagesController', mock);
2121
expect(!!homeCtrl).toBe(true);
2222
});
2323

2424
it('should define a messages Array property', () => {
25-
homeCtrl = controllerFactory('MessagesCtrl', mock);
25+
homeCtrl = controllerFactory('MessagesController', mock);
2626
expect(homeCtrl.messages instanceof Array).toBe(true);
2727
});
2828
});
@@ -34,7 +34,7 @@
3434
});
3535

3636
it('should be defined', ()=> {
37-
homeCtrl = controllerFactory('MessagesCtrl', mock);
37+
homeCtrl = controllerFactory('MessagesController', mock);
3838
expect(typeof homeCtrl.activate).toBe('function');
3939
});
4040

@@ -44,7 +44,7 @@
4444

4545
//when
4646
deferredResolution.resolve(mockData);
47-
homeCtrl = controllerFactory('MessagesCtrl', mock);
47+
homeCtrl = controllerFactory('MessagesController', mock);
4848
rootScope.$digest();
4949

5050
//then
@@ -61,7 +61,7 @@
6161

6262
it('should set messages property', () => {
6363
spyOn(mock.messageService, 'findAll').and.returnValue(deferredResolution.promise);
64-
homeCtrl = controllerFactory('MessagesCtrl', mock);
64+
homeCtrl = controllerFactory('MessagesController', mock);
6565
homeCtrl.init = ()=> {
6666
};//skip initialization because of testing loadMessages
6767

0 commit comments

Comments
 (0)