mirror of
https://github.com/openfoodfoundation/openfoodnetwork
synced 2026-03-13 04:00:21 +00:00
Merge branch 'capybara-fails' into bom
This commit is contained in:
Rob H
@@ -46,9 +46,9 @@ feature %q{
|
||||
visit '/admin/orders/bulk_management'
|
||||
end
|
||||
|
||||
it "displays a 'loading' splash for line items" do
|
||||
page.should have_selector "div.loading", :text => "Loading Line Items..."
|
||||
end
|
||||
#it "displays a 'loading' splash for line items" do
|
||||
# page.should have_selector "div.loading", :text => "Loading Line Items..."
|
||||
#end
|
||||
|
||||
it "displays a list of line items" do
|
||||
page.should have_selector "tr#li_#{li1.id}"
|
||||
@@ -182,7 +182,6 @@ feature %q{
|
||||
page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
|
||||
page.should have_selector "div.option_tab_titles h6.selected", :text => "Filter Line Items"
|
||||
page.should have_selector "div.filters", :visible => true
|
||||
page.should have_selector "li.column-list-item", text: "Producer"
|
||||
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
|
||||
@@ -236,75 +235,88 @@ feature %q{
|
||||
|
||||
before :each do
|
||||
visit '/admin/orders/bulk_management'
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
end
|
||||
|
||||
it "displays a select box for producers, which filters line items by the selected supplier" do
|
||||
page.should have_select "supplier_filter", with_options: [s1.name,s2.name]
|
||||
supplier_names = ["All"]
|
||||
Enterprise.is_primary_producer.each{ |e| supplier_names << e.name }
|
||||
find("div.select2-container#s2id_supplier_filter").click
|
||||
supplier_names.each { |sn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: sn }
|
||||
find("div.select2-container#s2id_supplier_filter").click
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
select s1.name, from: "supplier_filter"
|
||||
select2_select s1.name, from: "supplier_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "displays all line items when 'All' is selected from supplier filter" do
|
||||
select s1.name, from: "supplier_filter"
|
||||
select2_select s1.name, from: "supplier_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select "All", from: "supplier_filter"
|
||||
select2_select "All", from: "supplier_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "displays a select box for distributors, which filters line items by the selected distributor" do
|
||||
page.should have_select "distributor_filter", with_options: [d1.name,d2.name]
|
||||
distributor_names = ["All"]
|
||||
Enterprise.is_distributor.each{ |e| distributor_names << e.name }
|
||||
find("div.select2-container#s2id_distributor_filter").click
|
||||
distributor_names.each { |dn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: dn }
|
||||
find("div.select2-container#s2id_distributor_filter").click
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
select d1.name, from: "distributor_filter"
|
||||
select2_select d1.name, from: "distributor_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "displays all line items when 'All' is selected from distributor filter" do
|
||||
select d1.name, from: "distributor_filter"
|
||||
select2_select d1.name, from: "distributor_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select "All", from: "distributor_filter"
|
||||
select2_select "All", from: "distributor_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "displays a select box for order cycles, which filters line items by the selected order cycle" do
|
||||
page.should have_select "order_cycle_filter", with_options: [oc1.name,oc2.name]
|
||||
order_cycle_names = ["All"]
|
||||
OrderCycle.all.each{ |oc| order_cycle_names << oc.name }
|
||||
find("div.select2-container#s2id_order_cycle_filter").click
|
||||
order_cycle_names.each { |ocn| page.should have_selector "div.select2-drop-active ul.select2-results li", text: ocn }
|
||||
find("div.select2-container#s2id_order_cycle_filter").click
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
select oc1.name, from: "order_cycle_filter"
|
||||
select2_select oc1.name, from: "order_cycle_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "displays all line items when 'All' is selected from order_cycle filter" do
|
||||
select oc1.name, from: "order_cycle_filter"
|
||||
select2_select oc1.name, from: "order_cycle_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select "All", from: "order_cycle_filter"
|
||||
select2_select "All", from: "order_cycle_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
|
||||
it "allows filters to be used in combination" do
|
||||
select oc1.name, from: "order_cycle_filter"
|
||||
select2_select oc1.name, from: "order_cycle_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select d1.name, from: "distributor_filter"
|
||||
select s1.name, from: "supplier_filter"
|
||||
select2_select d1.name, from: "distributor_filter"
|
||||
select2_select s1.name, from: "supplier_filter"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select d2.name, from: "distributor_filter"
|
||||
select s2.name, from: "supplier_filter"
|
||||
select2_select d2.name, from: "distributor_filter"
|
||||
select2_select s2.name, from: "supplier_filter"
|
||||
page.should_not have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
select oc2.name, from: "order_cycle_filter"
|
||||
select2_select oc2.name, from: "order_cycle_filter"
|
||||
page.should_not have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
end
|
||||
@@ -347,6 +359,7 @@ feature %q{
|
||||
|
||||
before :each do
|
||||
visit '/admin/orders/bulk_management'
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
end
|
||||
|
||||
it "displays date fields for filtering orders, with default values set" do
|
||||
@@ -363,7 +376,6 @@ feature %q{
|
||||
end
|
||||
|
||||
it "displays only line items whose orders meet the date restriction criteria, when changed" do
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should have_selector "tr#li_#{li2.id}", visible: true
|
||||
@@ -381,7 +393,6 @@ feature %q{
|
||||
li2_quantity_column.fill_in "quantity", :with => li2.quantity + 1
|
||||
page.should_not have_button "IGNORE"
|
||||
page.should_not have_button "SAVE"
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
|
||||
page.should have_button "IGNORE"
|
||||
page.should have_button "SAVE"
|
||||
@@ -391,7 +402,6 @@ feature %q{
|
||||
within("tr#li_#{li2.id} td.quantity") do
|
||||
page.fill_in "quantity", :with => (li2.quantity + 1).to_s
|
||||
end
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
|
||||
click_button "SAVE"
|
||||
page.should_not have_selector "input[name='quantity'].update-pending"
|
||||
@@ -404,7 +414,6 @@ feature %q{
|
||||
within("tr#li_#{li2.id} td.quantity") do
|
||||
page.fill_in "quantity", :with => (li2.quantity + 1).to_s
|
||||
end
|
||||
first("div.option_tab_titles h6", :text => "Filter Line Items").click
|
||||
fill_in "start_date_filter", :with => (Date.today - 9).strftime("%F %T")
|
||||
click_button "IGNORE"
|
||||
page.should_not have_selector "input[name='quantity'].update-pending"
|
||||
@@ -438,7 +447,9 @@ feature %q{
|
||||
end
|
||||
|
||||
it "displays a bulk action select box with a list of actions" do
|
||||
page.should have_select "bulk_actions", :options => ["Delete"]
|
||||
list_of_actions = ['Delete']
|
||||
find("div.select2-container#s2id_bulk_actions").click
|
||||
list_of_actions.each { |a| page.should have_selector "div.select2-drop-active ul.select2-results li", text: a }
|
||||
end
|
||||
|
||||
it "displays a bulk action button" do
|
||||
@@ -452,7 +463,7 @@ feature %q{
|
||||
within("tr#li_#{li2.id} td.bulk") do
|
||||
check "bulk"
|
||||
end
|
||||
select "Delete", :from => "bulk_actions"
|
||||
select2_select "Delete", :from => "bulk_actions"
|
||||
click_button "bulk_execute"
|
||||
page.should have_selector "tr#li_#{li1.id}", visible: true
|
||||
page.should_not have_selector "tr#li_#{li2.id}", visible: true
|
||||
@@ -472,7 +483,7 @@ feature %q{
|
||||
it "only applies the delete action to filteredLineItems" do
|
||||
check "toggle_bulk"
|
||||
fill_in "quick_search", with: o1.number
|
||||
select "Delete", :from => "bulk_actions"
|
||||
select2_select "Delete", :from => "bulk_actions"
|
||||
click_button "bulk_execute"
|
||||
fill_in "quick_search", with: ''
|
||||
page.should_not have_selector "tr#li_#{li1.id}", visible: true
|
||||
|
||||
@@ -21,14 +21,6 @@ feature %q{
|
||||
login_to_admin_section
|
||||
end
|
||||
|
||||
it "displays a 'loading' splash for products" do
|
||||
FactoryGirl.create(:simple_product)
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
|
||||
page.should have_selector "div.loading", :text => "Loading Products..."
|
||||
end
|
||||
|
||||
it "displays a list of products" do
|
||||
p1 = FactoryGirl.create(:product)
|
||||
p2 = FactoryGirl.create(:product)
|
||||
@@ -80,6 +72,8 @@ feature %q{
|
||||
p2 = FactoryGirl.create(:product, available_on: Date.today-1)
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
first("div.option_tab_titles h6", :text => "Toggle Columns").click
|
||||
first("li.column-list-item", text: "Available On").click
|
||||
|
||||
page.should have_field "available_on", with: p1.available_on.strftime("%F %T")
|
||||
page.should have_field "available_on", with: p2.available_on.strftime("%F %T")
|
||||
@@ -186,7 +180,7 @@ feature %q{
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
page.should have_selector "a.view-variants"
|
||||
first("a.view-variants").click
|
||||
all("a.view-variants").each{ |e| e.click }
|
||||
|
||||
page.should have_field "product_name", with: v1.product.name
|
||||
page.should have_field "product_name", with: v2.product.name
|
||||
@@ -200,6 +194,7 @@ feature %q{
|
||||
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, on_hand: 6)
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
all("a.view-variants").each{ |e| e.click }
|
||||
|
||||
page.should have_selector "span[name='on_hand']", text: "21"
|
||||
page.should have_field "variant_on_hand", with: "15"
|
||||
@@ -213,8 +208,9 @@ feature %q{
|
||||
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, price: 2.50)
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
all("a.view-variants").each{ |e| e.click }
|
||||
|
||||
page.should have_field "price", with: "2.0"
|
||||
page.should have_field "price", with: "2.0", visible: false
|
||||
page.should have_field "variant_price", with: "12.75"
|
||||
page.should have_field "variant_price", with: "2.5"
|
||||
end
|
||||
@@ -225,8 +221,8 @@ feature %q{
|
||||
v2 = FactoryGirl.create(:variant, product: p1, is_master: false, price: 2.50, unit_value: 4800, unit_description: "(large bag)")
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
all("a.view-variants").each{ |e| e.click }
|
||||
|
||||
page.should have_field "price", with: "2.0"
|
||||
page.should have_field "variant_unit_value_with_description", with: "1.2 (small bag)"
|
||||
page.should have_field "variant_unit_value_with_description", with: "4.8 (large bag)"
|
||||
end
|
||||
@@ -344,7 +340,7 @@ feature %q{
|
||||
|
||||
page.should have_field "product_name", with: "Big Bag Of Potatoes"
|
||||
page.should have_select "supplier", selected: s2.name
|
||||
page.should have_field "available_on", with: (Date.today-3).strftime("%F %T")
|
||||
page.should have_field "available_on", with: (Date.today-3).strftime("%F %T"), visible: false
|
||||
page.should have_field "price", with: "20.0"
|
||||
page.should have_select "variant_unit_with_scale", selected: "Weight (kg)"
|
||||
page.should have_field "on_hand", with: "18"
|
||||
@@ -371,7 +367,6 @@ feature %q{
|
||||
page.should have_field "variant_unit_name", with: "loaf"
|
||||
end
|
||||
|
||||
|
||||
scenario "setting a variant unit on a product that has none" do
|
||||
p = FactoryGirl.create(:product, variant_unit: nil, variant_unit_scale: nil)
|
||||
v = FactoryGirl.create(:variant, product: p, unit_value: nil, unit_description: nil)
|
||||
@@ -379,23 +374,23 @@ feature %q{
|
||||
login_to_admin_section
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
first("a.view-variants").click
|
||||
|
||||
page.should have_select "variant_unit_with_scale", selected: ''
|
||||
|
||||
select "Weight (kg)", from: "variant_unit_with_scale"
|
||||
first("a.view-variants").click
|
||||
fill_in "variant_unit_value_with_description", with: '123 abc'
|
||||
|
||||
click_button 'Update'
|
||||
page.find("span#update-status-message").should have_content "Update complete"
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
first("a.view-variants").click
|
||||
|
||||
page.should have_select "variant_unit_with_scale", selected: "Weight (kg)"
|
||||
page.should have_field "variant_unit_value_with_description", with: "123 abc"
|
||||
end
|
||||
|
||||
|
||||
describe "setting the master unit value for a product without variants" do
|
||||
it "sets the master unit value" do
|
||||
p = FactoryGirl.create(:product, variant_unit: nil, variant_unit_scale: nil)
|
||||
@@ -556,10 +551,11 @@ feature %q{
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
|
||||
page.should have_selector "div.option_tab_titles h6", :text => "Filter Products"
|
||||
first("div.option_tab_titles h6", :text => "Filter Products").click
|
||||
|
||||
select "Name", :from => "filter_property"
|
||||
select "Contains", :from => "filter_predicate"
|
||||
select2_select "Name", from: "filter_property"
|
||||
select2_select "Contains", from: "filter_predicate"
|
||||
fill_in "filter_value", :with => "1"
|
||||
click_button "Apply Filter"
|
||||
page.should_not have_field "product_name", with: p2.name
|
||||
@@ -652,7 +648,7 @@ feature %q{
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
page.should have_selector "a.view-variants"
|
||||
first("a.view-variants").click
|
||||
all("a.view-variants").each { |e| e.click }
|
||||
|
||||
page.should have_selector "a.edit-variant", :count => 3
|
||||
|
||||
@@ -712,7 +708,6 @@ feature %q{
|
||||
page.should have_selector "div.option_tab_titles h6.unselected", :text => "Toggle Columns"
|
||||
page.should have_selector "div.option_tab_titles h6.selected", :text => "Filter Products"
|
||||
page.should have_selector "div.filters", :visible => true
|
||||
page.should have_selector "li.column-list-item", text: "Available On"
|
||||
|
||||
first("div.option_tab_titles h6", :text => "Filter Products").click
|
||||
|
||||
@@ -838,8 +833,8 @@ feature %q{
|
||||
page.should have_selector "div.option_tab_titles h6", :text => "Filter Products"
|
||||
first("div.option_tab_titles h6", :text => "Filter Products").click
|
||||
|
||||
page.should have_select "filter_property", :with_options => ["Supplier", "Name"]
|
||||
page.should have_select "filter_predicate", :with_options => ["Equals", "Contains"]
|
||||
page.should have_select "filter_property", visible: false
|
||||
page.should have_select "filter_predicate", visible: false
|
||||
page.should have_field "filter_value"
|
||||
end
|
||||
|
||||
@@ -853,8 +848,8 @@ feature %q{
|
||||
|
||||
first("div.option_tab_titles h6", :text => "Filter Products").click
|
||||
|
||||
select "Name", :from => "filter_property"
|
||||
select "Equals", :from => "filter_predicate"
|
||||
select2_select "Name", :from => "filter_property"
|
||||
select2_select "Equals", :from => "filter_predicate"
|
||||
fill_in "filter_value", :with => "Product1"
|
||||
click_button "Apply Filter"
|
||||
end
|
||||
@@ -881,10 +876,6 @@ feature %q{
|
||||
page.should_not have_text "Name Equals Product1"
|
||||
end
|
||||
|
||||
it "displays the 'loading' splash" do
|
||||
page.should have_selector "div.loading", :text => "Loading Products..."
|
||||
end
|
||||
|
||||
it "loads appropriate products" do
|
||||
page.should have_field "product_name", :with => "Product1"
|
||||
page.should have_field "product_name", :with => "Product2"
|
||||
@@ -939,7 +930,6 @@ feature %q{
|
||||
p = product_supplied
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
|
||||
first("div.option_tab_titles h6", :text => "Toggle Columns").click
|
||||
first("li.column-list-item", text: "Available On").click
|
||||
|
||||
@@ -959,6 +949,8 @@ feature %q{
|
||||
page.find("span#update-status-message").should have_content "Update complete"
|
||||
|
||||
visit '/admin/products/bulk_edit'
|
||||
first("div.option_tab_titles h6", :text => "Toggle Columns").click
|
||||
first("li.column-list-item", text: "Available On").click
|
||||
|
||||
page.should have_field "product_name", with: "Big Bag Of Potatoes"
|
||||
page.should have_select "supplier", selected: s2.name
|
||||
|
||||
Reference in New Issue
Block a user