Merge branch 'master' into units

spec/javascripts/unit/darkswarm/controllers/checkout/accordion_controller_spec.js.coffee

@@ -30,11 +30,3 @@ describe "AccordionCtrl", ->
         scope.order =
           id: 129
         ctrl = $controller 'AccordionCtrl', {$scope: scope}
-
-  it "automatically closes all sections if the entire form is valid", ->
-    waitsFor ->
-      (scope.accordion.details and 
-      scope.accordion.shipping and
-      scope.accordion.payment and
-      scope.accordion.billing) == false
-    , "the accordion to close", 100

spec/javascripts/unit/darkswarm/controllers/checkout/checkout_controller_spec.js.coffee

@@ -10,13 +10,18 @@ describe "CheckoutCtrl", ->
     Order = 
       submit: ->
       navigate: ->
+      bindFieldsToLocalStorage: ->
       order:
         id: 1
+        email: "public"
+      secrets:
+        card_number: "this is a secret"
      
   describe "with user", ->
     beforeEach ->
       inject ($controller, $rootScope) ->
         scope = $rootScope.$new() 
+        spyOn(Order, "bindFieldsToLocalStorage")
         ctrl = $controller 'CheckoutCtrl', {$scope: scope, Order: Order, CurrentUser: {}}
   
     it "delegates to the service on submit", ->
@@ -29,6 +34,9 @@ describe "CheckoutCtrl", ->
     it "is enabled", ->
       expect(scope.enabled).toEqual true
 
+    it "triggers localStorage binding", ->
+      expect(Order.bindFieldsToLocalStorage).toHaveBeenCalled()
+
   describe "without user", ->
     beforeEach ->
       inject ($controller, $rootScope) ->
@@ -37,3 +45,8 @@ describe "CheckoutCtrl", ->
 
     it "is disabled", ->
       expect(scope.enabled).toEqual false
+
+    it "does not store secrets in local storage", ->
+      keys = (localStorage.key(i) for i in [0..localStorage.length])
+      for key in keys
+        expect(localStorage.getItem(key)).not.toMatch Order.secrets.card_number

spec/javascripts/unit/darkswarm/services/order_spec.js.coffee

@@ -2,16 +2,22 @@ describe 'Order service', ->
   Order = null
   orderData = null
   $httpBackend = null
-  CheckoutFormState = null
   Navigation = null
   flash = null
+  storage = null
+  scope = null
 
   beforeEach ->
-    orderData = {
+    orderData =
       id: 3102
       payment_method_id: null
-      bill_address: {test: "foo"}
+      email: "test@test.com"
+      bill_address:
+        test: "foo"
+        firstname: "Robert"
+        lastname: "Harrington"
       ship_address: {test: "bar"}
+      user_id: 901
       shipping_methods:
         7:
           require_ship_address: true
@@ -23,22 +29,51 @@ describe 'Order service', ->
       payment_methods: 
         99:
           test: "foo"
-    }
+          method_type: "gateway"
+        123:
+          test: "bar"
+          method_type: "check"
+
     angular.module('Darkswarm').value('order', orderData)
     module 'Darkswarm'
 
-    inject ($injector, _$httpBackend_)->
+    inject ($injector, _$httpBackend_, _storage_, $rootScope)->
       $httpBackend = _$httpBackend_
+      storage = _storage_
       Order = $injector.get("Order")
+      scope = $rootScope.$new()
+      scope.Order = Order
       Navigation = $injector.get("Navigation")
       flash = $injector.get("flash")
-      CheckoutFormState = $injector.get("CheckoutFormState")
       spyOn(Navigation, "go") # Stubbing out writes to window.location
 
   it "defaults to no shipping method", ->
     expect(Order.order.shipping_method_id).toEqual null
     expect(Order.shippingMethod()).toEqual undefined
 
+  it "has a shipping price of zero with no shipping method", ->
+    expect(Order.shippingPrice()).toEqual 0.0
+
+  it "binds to localStorage when given a scope", ->
+    spyOn(storage, "bind")
+    Order.fieldsToBind = ["testy"]
+    Order.bindFieldsToLocalStorage({})
+    prefix = "order_#{Order.order.id}#{Order.order.user_id}"
+    expect(storage.bind).toHaveBeenCalledWith({}, "Order.order.testy", {storeName: "#{prefix}_testy"})
+    expect(storage.bind).toHaveBeenCalledWith({}, "Order.ship_address_same_as_billing", {storeName: "#{prefix}_sameasbilling", defaultValue: true})
+
+  it "binds order to local storage", ->
+    Order.bindFieldsToLocalStorage(scope)
+    prefix = "order_#{Order.order.id}#{Order.order.user_id}"
+    expect(localStorage.getItem("#{prefix}_email")).toMatch "test@test.com" 
+
+  it "does not store secrets in local storage", ->
+    Order.secrets =
+      card_number: "superfuckingsecret"
+    Order.bindFieldsToLocalStorage(scope)
+    keys = (localStorage.key(i) for i in [0..localStorage.length])
+    for key in keys
+      expect(localStorage.getItem(key)).not.toMatch Order.secrets.card_number
 
   describe "with shipping method", ->
     beforeEach ->
@@ -57,7 +92,7 @@ describe 'Order service', ->
   it 'Gets the current payment method', ->
     expect(Order.paymentMethod()).toEqual null
     Order.order.payment_method_id = 99
-    expect(Order.paymentMethod()).toEqual {test: "foo"}
+    expect(Order.paymentMethod()).toEqual {test: "foo", method_type: "gateway"}
 
   it "Posts the Order to the server", ->
     $httpBackend.expectPUT("/checkout", {order: Order.preprocess()}).respond 200, {path: "test"}
@@ -76,14 +111,39 @@ describe 'Order service', ->
     $httpBackend.flush()
     expect(Order.errors).toEqual {error: "frogs"}
 
-  it "Munges the order attributes to add _attributes as Rails needs", ->
-    expect(Order.preprocess().bill_address_attributes).not.toBe(undefined)
-    expect(Order.preprocess().bill_address).toBe(undefined)
-    expect(Order.preprocess().ship_address_attributes).not.toBe(undefined)
-    expect(Order.preprocess().ship_address).toBe(undefined)
+  describe "data preprocessing", ->
+    beforeEach ->
+      Order.order.payment_method_id = 99
 
-  it "Munges the order attributes to clone ship address from bill address", ->
-    CheckoutFormState.ship_address_same_as_billing = false
-    expect(Order.preprocess().ship_address_attributes).toEqual(orderData.ship_address)
-    CheckoutFormState.ship_address_same_as_billing = true
-    expect(Order.preprocess().ship_address_attributes).toEqual(orderData.bill_address)
+      Order.secrets =
+        card_number: "1234567890123456"
+        card_month: "10"
+        card_year: "2015"
+        card_verification_value: "123"
+
+    it "munges the order attributes to add _attributes as Rails needs", ->
+      expect(Order.preprocess().bill_address_attributes).not.toBe(undefined)
+      expect(Order.preprocess().bill_address).toBe(undefined)
+      expect(Order.preprocess().ship_address_attributes).not.toBe(undefined)
+      expect(Order.preprocess().ship_address).toBe(undefined)
+
+    it "munges the order attributes to clone ship address from bill address", ->
+      Order.ship_address_same_as_billing = false
+      expect(Order.preprocess().ship_address_attributes).toEqual(orderData.ship_address)
+      Order.ship_address_same_as_billing = true
+      expect(Order.preprocess().ship_address_attributes).toEqual(orderData.bill_address)
+
+    it "creates attributes for card fields", ->
+      source_attributes = Order.preprocess().payments_attributes[0].source_attributes
+      expect(source_attributes).toBeDefined()
+      expect(source_attributes.number).toBe Order.secrets.card_number
+      expect(source_attributes.month).toBe Order.secrets.card_month
+      expect(source_attributes.year).toBe Order.secrets.card_year
+      expect(source_attributes.verification_value).toBe Order.secrets.card_verification_value
+      expect(source_attributes.first_name).toBe Order.order.bill_address.firstname
+      expect(source_attributes.last_name).toBe Order.order.bill_address.lastname
+
+    it "does not create attributes for card fields when no card is supplied", ->
+      Order.order.payment_method_id = 123
+      source_attributes = Order.preprocess().payments_attributes[0].source_attributes
+      expect(source_attributes).not.toBeDefined()