Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-07-11 01:31:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(articles): Article controllers name conflicts (#1428)

Browse Source 
* fix(articles): Article controllers name conflicts

Fixes the naming conflicts for the Articles controllers.

Due to how Angular injects the controllers into the StateProvider,
naming conflicts were caused between the Articles public & admin module
controllers.

To resolve the issue the referenced controllers in the Articles admin
route configurations must be unique, and match up with the Admin
controllers.

* Client-side tests failing

Fixed the client-side tests that were failing due to the naming
conflicts.
This commit is contained in:
Michael Leanos
2016-08-26 03:27:43 -07:00
committed by Liran Tal
parent 96aec09488
commit c96f8c0b56
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/articles/tests/client/admin.articles.client.controller.tests.js
View File

@@ -1,9 +1,9 @@
(function () {
'use strict';
describe('Articles Controller Tests', function () {
describe('Articles Admin Controller Tests', function () {
// Initialize global variables
var ArticlesController,
var ArticlesAdminController,
$scope,
$httpBackend,
$state,
@@ -59,7 +59,7 @@
};
// Initialize the Articles controller.
ArticlesController = $controller('ArticlesController as vm', {
ArticlesAdminController = $controller('ArticlesAdminController as vm', {
$scope: $scope,
articleResolve: {}
});