raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-09 03:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into pr/1033

Browse Source
This commit is contained in:
Rob Harrington
2016-06-16 15:12:30 +10:00
parent 25cdd4af8e be7e46300c
commit a909f0ddb8
34 changed files with 204 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/javascripts/unit/admin/customers/controllers/customers_controller_spec.js.coffee
View File

@@ -29,7 +29,7 @@ describe "CustomersCtrl", ->
expect(CurrentShop.shop).toEqual {}
describe "setting the shop on scope", ->
customer = { id: 5, email: 'someone@email.com'}
customer = { id: 5, email: 'someone@email.com', code: 'a'}
customers = [customer]
beforeEach inject (pendingChanges) ->
@@ -52,6 +52,12 @@ describe "CustomersCtrl", ->
it "retrievs the list of customers", ->
expect(scope.customers).toDeepEqual customers
it "finds customers by code", ->
as = scope.findByCode('a')
expect(as).toDeepEqual customers
as = scope.findByCode('b')
expect(as).toDeepEqual []
describe "scope.add", ->
it "creates a new customer", ->
email = "customer@example.org"

3
spec/javascripts/unit/admin/order_cycles/controllers/simple_create.js.coffee
View File

@@ -8,7 +8,8 @@ describe "AdminSimpleCreateOrderCycleCtrl", ->
outgoing_exchange = {}
beforeEach ->
scope = {}
scope =
$watch: jasmine.createSpy('$watch')
order_cycle =
coordinator_id: 123
incoming_exchanges: [incoming_exchange]

3
spec/javascripts/unit/admin/tag_rules/controllers/tag_rules_controller_spec.js.coffee
View File

@@ -15,6 +15,7 @@ describe "TagRulesCtrl", ->
inject ($rootScope, $controller) ->
scope = $rootScope
scope.enterprise_form = jasmine.createSpyObj('enterprise_form', ['$setDirty'])
ctrl = $controller 'TagRulesCtrl', {$scope: scope, enterprise: enterprise}
describe "tagGroup start indices", ->
@@ -27,6 +28,8 @@ describe "TagRulesCtrl", ->
scope.addNewRuleTo(scope.tagGroups[0], "DiscountOrder")
it "adds a new rule of the specified type to the rules array for the tagGroup", ->
expect(scope.enterprise_form.$setDirty).toHaveBeenCalled()
expect(scope.tagGroups[0].rules.length).toEqual 3
expect(scope.tagGroups[0].rules[2].type).toEqual "TagRule::DiscountOrder"