raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-28 01:53:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix file naming and controller definition/testing

Browse Source
This commit is contained in:
Rohan Mitchell
2013-01-11 14:09:56 +11:00
parent f971958042
commit d3fca565a3
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/admin/order_cycle.js.coffee.erb → app/assets/javascripts/admin/order_cycle.js.erb.coffee
View File

@@ -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]

2
config-angular/testacular.conf.js
View File

@@ -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*'
];

11
spec/javascripts/unit/order_cycle_spec.js.coffee
View File

@@ -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()