raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use select2_search instead of targetted_select2_search

Browse Source
This commit is contained in:
Rob Harrington
2018-02-20 15:11:20 +11:00
committed by Rob H
parent 2e94654f91
commit 6bdbdc06e7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/subscriptions/_autocomplete.html.haml
View File

@@ -8,7 +8,7 @@
%tr
%td{ style: "vertical-align:top" }
.field
= label_tag :add_product_name, t(:name_or_sku)
= label_tag :add_variant_id, t(:name_or_sku)
%input#add_variant_id.variant_autocomplete.fullwidth{ type: 'number', ng: { model: 'newItem.variant_id' } }
%td{ style: "vertical-align:top" }
.field

8
spec/features/admin/subscriptions_spec.rb
View File

@@ -201,7 +201,7 @@ feature 'Subscriptions' do
expect(page).to have_content 'Please add at least one product'
# Adding a product and getting a price estimate
targetted_select2_search product1.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
select2_search product1.name, from: I18n.t(:name_or_sku), dropdown_css: '.select2-drop'
fill_in 'add_quantity', with: 2
click_link 'Add'
within 'table#subscription-line-items tr.item', match: :first do
@@ -225,7 +225,7 @@ feature 'Subscriptions' do
}.to_not change(Subscription, :count)
# Adding a new product
targetted_select2_search product2.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
select2_search product2.name, from: I18n.t(:name_or_sku), dropdown_css: '.select2-drop'
fill_in 'add_quantity', with: 3
click_link 'Add'
within 'table#subscription-line-items tr.item', match: :first do
@@ -315,7 +315,7 @@ feature 'Subscriptions' do
expect(page).to have_content 'Please add at least one product'
# Add variant2 to the subscription
targetted_select2_search product2.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
select2_search product2.name, from: I18n.t(:name_or_sku), dropdown_css: '.select2-drop'
fill_in 'add_quantity', with: 1
click_link 'Add'
within "#sli_0" do
@@ -329,7 +329,7 @@ feature 'Subscriptions' do
expect(page).to have_selector '#order_form_total', text: "$7.75"
# Add variant3 to the subscription (even though it is not available)
targetted_select2_search product3.name, from: '#add_variant_id', dropdown_css: '.select2-drop'
select2_search product3.name, from: I18n.t(:name_or_sku), dropdown_css: '.select2-drop'
fill_in 'add_quantity', with: 1
click_link 'Add'
within "#sli_1" do