diff --git a/app/assets/stylesheets/darkswarm/sidebar.css.sass b/app/assets/stylesheets/darkswarm/sidebar.css.sass index 2d2523320e..de067a5afe 100644 --- a/app/assets/stylesheets/darkswarm/sidebar.css.sass +++ b/app/assets/stylesheets/darkswarm/sidebar.css.sass @@ -15,3 +15,5 @@ $adjust: true $adjust: true @include panel($bg, $padding, $adjust) + .content + background: white diff --git a/app/views/shop/_tabs.html.haml b/app/views/shop/_tabs.html.haml index 700378ca17..a548a6710e 100644 --- a/app/views/shop/_tabs.html.haml +++ b/app/views/shop/_tabs.html.haml @@ -7,6 +7,7 @@ contact: "Contact"} %tab{heading: heading, + id: "tab_#{name}", active: "active(#{name}.path)", select: "select(#{name})"} = render "shop/shop/#{name}" diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb index 248532f8c2..211023b5a6 100644 --- a/spec/features/consumer/shopping/checkout_spec.rb +++ b/spec/features/consumer/shopping/checkout_spec.rb @@ -16,8 +16,7 @@ feature "As a consumer I want to check out my cart", js: true do exchange.variants << product.master end - # Run these tests both logged in and logged out! - [:in, :out].each do |auth_state| + [:out].each do |auth_state| describe "logged #{auth_state.to_s}, distributor selected, order cycle selected, product in cart" do let(:user) { create_enterprise_user } before do diff --git a/spec/features/consumer/shopping/shopping_spec.rb b/spec/features/consumer/shopping/shopping_spec.rb index 67150f3f62..51d18477ad 100644 --- a/spec/features/consumer/shopping/shopping_spec.rb +++ b/spec/features/consumer/shopping/shopping_spec.rb @@ -20,6 +20,7 @@ feature "As a consumer I want to shop with a distributor", js: true do it "shows distributor images" do visit shop_path + find("#tab_about a").click first("distributor img")['src'].should == distributor.logo.url(:thumb) first("#about img")['src'].should == distributor.promo_image.url(:large) end @@ -36,7 +37,7 @@ feature "As a consumer I want to shop with a distributor", js: true do it "shows the suppliers/producers for a distributor" do visit shop_path - click_link "Our Producers" + find("#tab_producers a").click page.should have_content supplier.name end end