diff --git a/app/assets/javascripts/admin/order_cycle.js.coffee.erb b/app/assets/javascripts/admin/order_cycle.js.erb.coffee similarity index 96% rename from app/assets/javascripts/admin/order_cycle.js.coffee.erb rename to app/assets/javascripts/admin/order_cycle.js.erb.coffee index 82d287437f..d8cbc4b3ea 100644 --- a/app/assets/javascripts/admin/order_cycle.js.coffee.erb +++ b/app/assets/javascripts/admin/order_cycle.js.erb.coffee @@ -1,6 +1,6 @@ app = angular.module('order_cycle', ['ngResource']) -AdminCreateOrderCycleCtrl = ($scope, OrderCycle, Enterprise) -> +app.controller 'AdminCreateOrderCycleCtrl', ($scope, OrderCycle, Enterprise) -> $scope.enterprises = Enterprise.index() $scope.order_cycle = OrderCycle.order_cycle @@ -23,7 +23,7 @@ AdminCreateOrderCycleCtrl = ($scope, OrderCycle, Enterprise) -> OrderCycle.create() -AdminEditOrderCycleCtrl = ($scope, $location, OrderCycle, Enterprise) -> +app.controller 'AdminEditOrderCycleCtrl', ($scope, $location, OrderCycle, Enterprise) -> $scope.enterprises = Enterprise.index() order_cycle_id = $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1] diff --git a/config-angular/testacular.conf.js b/config-angular/testacular.conf.js index 3d62b0140f..9147464ce3 100644 --- a/config-angular/testacular.conf.js +++ b/config-angular/testacular.conf.js @@ -7,7 +7,7 @@ files = [ 'app/assets/javascripts/shared/angular.js', 'app/assets/javascripts/shared/angular-*.js', - 'app/assets/javascripts/admin/order_cycle.js.erb', + 'app/assets/javascripts/admin/order_cycle.js.erb.coffee', 'spec/javascripts/unit/**/*.js*' ]; diff --git a/spec/javascripts/unit/order_cycle_spec.js.coffee b/spec/javascripts/unit/order_cycle_spec.js.coffee index f9a76d6b4a..e947a8655b 100644 --- a/spec/javascripts/unit/order_cycle_spec.js.coffee +++ b/spec/javascripts/unit/order_cycle_spec.js.coffee @@ -20,7 +20,11 @@ describe 'OrderCycle controllers', -> Enterprise = index: jasmine.createSpy('index').andReturn('enterprises list') totalVariants: jasmine.createSpy('totalVariants').andReturn('variants total') - ctrl = new AdminCreateOrderCycleCtrl(scope, OrderCycle, Enterprise) + + module('order_cycle') + inject ($controller) -> + ctrl = $controller 'AdminCreateOrderCycleCtrl', {$scope: scope, OrderCycle: OrderCycle, Enterprise: Enterprise} + it 'Loads enterprises', -> expect(Enterprise.index).toHaveBeenCalled() @@ -76,7 +80,10 @@ describe 'OrderCycle controllers', -> Enterprise = index: jasmine.createSpy('index').andReturn('enterprises list') totalVariants: jasmine.createSpy('totalVariants').andReturn('variants total') - ctrl = new AdminEditOrderCycleCtrl(scope, location, OrderCycle, Enterprise) + + module('order_cycle') + inject ($controller) -> + ctrl = $controller 'AdminEditOrderCycleCtrl', {$scope: scope, $location: location, OrderCycle: OrderCycle, Enterprise: Enterprise} it 'Loads enterprises', -> expect(Enterprise.index).toHaveBeenCalled()