Merge branch 'laura_and_will' into maps

This commit is contained in:
Will Marshall
2014-06-05 15:50:53 +10:00
51 changed files with 558 additions and 137 deletions

View File

@@ -20,6 +20,11 @@ feature "As a consumer I want to shop with a distributor", js: true do
end
it "shows a distributor with images" do
# Given the distributor has a logo
distributor.logo = File.new(Rails.root + 'app/assets/images/logo.jpg')
distributor.save!
# Then we should see the distributor and its logo
visit shop_path
page.should have_text distributor.name
find("#tab_about a").click