From a7340df6a567fc4a1a55d15e4bfbdbb1e584eb78 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 30 May 2014 14:45:27 +1000 Subject: [PATCH] Removing some dud test content --- spec/features/admin/products_spec.rb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/spec/features/admin/products_spec.rb b/spec/features/admin/products_spec.rb index 184dd4a7c4..3714a0e91f 100644 --- a/spec/features/admin/products_spec.rb +++ b/spec/features/admin/products_spec.rb @@ -57,13 +57,6 @@ feature %q{ visit spree.edit_admin_product_path(product) -<<<<<<< HEAD -======= - fill_in 'product_name', :with => 'A new product !!!' - fill_in 'product_price', :with => '19.99' - select taxon.name, from: "product_primary_taxon_id" - select 'New supplier', :from => 'product_supplier_id' ->>>>>>> 110a6f2... Adding primary taxon to admin forms choose 'product_group_buy_1' fill_in 'Group buy unit size', :with => '10'