raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing some dud debugging stuff, fiddling with the checkout spec

Browse Source
This commit is contained in:
Will Marshall
2014-02-27 16:11:17 +11:00
parent 19fa7200f3
commit c1cdf3e331
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/darkswarm/controllers/checkout_controller.js.coffee
View File

@@ -4,7 +4,6 @@ angular.module("Checkout").controller "CheckoutCtrl", ($scope, $rootScope) ->
$scope.payment_method = -1
$scope.shippingMethodChanged = ->
console.log $("#order_shipping_method_id_" + $scope.shipping_method).attr("data-require-ship-address")
$scope.require_ship_address = $("#order_shipping_method_id_" + $scope.shipping_method).attr("data-require-ship-address")
$scope.purchase = (event)->

1
app/views/shop/checkout/_form.html.haml
View File

@@ -36,7 +36,6 @@
.large-6.columns.right
= ba.text_field :zipcode
{{ require_ship_address }}
%fieldset#shipping
%legend Shipping

7
spec/features/consumer/shopping/checkout_spec.rb
View File

@@ -122,7 +122,7 @@ feature "As a consumer I want to check out my cart", js: true do
describe "with shipping methods" do
let(:sm1) { create(:shipping_method, require_ship_address: true, name: "Frogs", description: "yellow") }
let(:sm2) { create(:shipping_method, require_ship_address: true, name: "Donkeys", description: "blue") }
let(:sm2) { create(:shipping_method, require_ship_address: false, name: "Donkeys", description: "blue") }
before do
distributor.shipping_methods << sm1
distributor.shipping_methods << sm2
@@ -133,12 +133,14 @@ feature "As a consumer I want to check out my cart", js: true do
page.should have_content "Donkeys"
end
it "doesn't show ship address forms by default" do
it "doesn't show ship address forms " do
choose(sm2.name)
find("#ship_address").visible?.should be_false
end
it "shows ship address forms when selected shipping method requires one" do
choose(sm1.name)
save_and_open_page
find("#ship_address").visible?.should be_true
end
@@ -159,6 +161,7 @@ feature "As a consumer I want to check out my cart", js: true do
describe "Purchasing" do
it "re-renders with errors when we submit the incomplete form" do
save_and_open_page
click_button "Purchase"
current_path.should == "/shop/checkout"
page.should have_content "can't be blank"