From be640fd856dfbabd856df9d9a9017d671ba821f4 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 30 May 2014 15:02:47 +1000 Subject: [PATCH] Patching a spec and naming something --- app/views/shopping_shared/_tabs.html.haml | 2 +- spec/features/admin/bulk_product_update_spec.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/shopping_shared/_tabs.html.haml b/app/views/shopping_shared/_tabs.html.haml index 3a29a12e6c..a5320a7ec5 100644 --- a/app/views/shopping_shared/_tabs.html.haml +++ b/app/views/shopping_shared/_tabs.html.haml @@ -1,7 +1,7 @@ #tabs{"ng-controller" => "TabsCtrl"} .row %tabset - - for name, heading in { about: "About Us", + - for name, heading in { about: "About #{current_distributor.name}", producers: "Producers", groups: "Groups", contact: "Contact"} diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb index d89280df80..0e15fbd2f4 100644 --- a/spec/features/admin/bulk_product_update_spec.rb +++ b/spec/features/admin/bulk_product_update_spec.rb @@ -223,20 +223,19 @@ feature %q{ scenario "creating a new product" do s = FactoryGirl.create(:supplier_enterprise) d = FactoryGirl.create(:distributor_enterprise) + taxon = create(:taxon) login_to_admin_section visit '/admin/products/bulk_edit' - #save_screenshot "/Users/willmarshall/Desktop/foo.png" - #save_and_open_page find("a", text: "NEW PRODUCT").click - page.should have_content 'NEW PRODUCT' fill_in 'product_name', :with => 'Big Bag Of Apples' select(s.name, :from => 'product_supplier_id') fill_in 'product_price', :with => '10.00' + select taxon.name, from: 'product_primary_taxon_id' click_button 'Create' URI.parse(current_url).path.should == '/admin/products/bulk_edit'