solidus_backend 2.2.2 → 2.3.0.beta1

data/spec/features/admin/products/edit/variants_spec.rb

@@ -46,7 +46,7 @@ describe "Product Variants", type: :feature do
       within('nav > ul.tabs') { click_link "Variants" }
       click_link "New Variant"
 
-      targetted_select2 "black", from: "#s2id_variant_option_value_ids"
+      select "black", from: "Colors"
       fill_in "variant_sku", with: "A100"
       click_button "Create"
       expect(page).to have_content("successfully created!")

data/spec/features/admin/products/option_types_spec.rb

@@ -58,10 +58,10 @@ describe "Option Types", type: :feature do
 
   # Regression test for https://github.com/spree/spree/issues/2277
   it "can remove an option value from an option type", js: true do
-    create(:option_value)
+    option_value = create(:option_value)
     click_link "Option Types"
     within('table#listing_option_types') { click_icon :edit }
-    expect(page).to have_content("ProductsOption Typesfoo-size-")
+    expect(page).to have_title("#{option_value.option_type.name} - Option Types - Products")
     expect(page).to have_css("tbody#option_values tr", count: 1)
     within("tbody#option_values") do
       find('.spree_remove_fields').click

data/spec/features/admin/products/products_spec.rb

@@ -69,6 +69,23 @@ describe "Products", type: :feature do
           end
         end
       end
+      context "when none of the product prices are in the same currency as the default in the store" do
+        before do
+          Spree::Config[:currency] = "MXN"
+        end
+
+        let!(:product) do
+          create(:product, name: "Just a product", price: 19.99)
+        end
+
+        it 'defaults it to Spree::Config.currency and sets the price as blank' do
+          Spree::Config[:currency] = "USD"
+          visit spree.admin_product_path(product)
+          within("#product_price_field") do
+            expect(page).to have_content("USD")
+          end
+        end
+      end
     end
 
     context "searching products" do
@@ -81,6 +98,7 @@ describe "Products", type: :feature do
         expect(page).not_to have_content("apache baseball cap")
         check "Show Deleted"
         click_button 'Search'
+        expect(find('input[name="q[with_deleted]"]')).to be_checked
         expect(page).to have_content("zomg shirt")
         expect(page).to have_content("apache baseball cap")
         uncheck "Show Deleted"
@@ -95,18 +113,43 @@ describe "Products", type: :feature do
         create(:product, name: 'zomg shirt')
 
         click_nav "Products"
-        fill_in "q_name_cont", with: "ap"
+        fill_in "Name", with: "ap"
         click_button 'Search'
         expect(page).to have_content("apache baseball cap")
         expect(page).to have_content("apache baseball cap2")
         expect(page).not_to have_content("zomg shirt")
 
-        fill_in "q_variants_including_master_sku_cont", with: "A1"
+        fill_in "SKU", with: "A1"
         click_button "Search"
         expect(page).to have_content("apache baseball cap")
         expect(page).not_to have_content("apache baseball cap2")
         expect(page).not_to have_content("zomg shirt")
       end
+
+      # Regression test for https://github.com/solidusio/solidus/issues/2016
+      it "should be able to search and sort by price" do
+        product = create(:product, name: 'apache baseball cap', sku: "A001")
+        create(:variant, product: product, sku: "A002")
+        create(:product, name: 'zomg shirt', sku: "Z001")
+
+        click_nav "Products"
+        expect(page).to have_content("apache baseball cap")
+        expect(page).to have_content("zomg shirt")
+        expect(page).to have_css('#listing_products > tbody > tr', count: 2)
+
+        fill_in "SKU", with: "A"
+        click_button 'Search'
+        expect(page).to have_content("apache baseball cap")
+        expect(page).not_to have_content("zomg shirt")
+        expect(page).to have_css('#listing_products > tbody > tr', count: 1)
+
+        # Sort by master price
+        click_on 'Master Price'
+        expect(page).to have_css('.sort_link.asc', text: 'Master Price')
+        expect(page).to have_content("apache baseball cap")
+        expect(page).not_to have_content("zomg shirt")
+        expect(page).to have_css('#listing_products > tbody > tr', count: 1)
+      end
     end
 
     context "creating a new product" do
@@ -234,7 +277,7 @@ describe "Products", type: :feature do
     context 'deleting a product', js: true do
       let!(:product) { create(:product) }
 
-      it "is still viewable" do
+      it "product details are still viewable" do
         visit spree.admin_products_path
 
         expect(page).to have_content(product.name)
@@ -249,6 +292,9 @@ describe "Products", type: :feature do
         click_button "Search"
         click_link product.name
         expect(page).to have_field('Master Price', with: product.price.to_f)
+        expect(page).to_not have_content('Images')
+        expect(page).to_not have_content('Prices')
+        expect(page).to_not have_content('Product Properties')
       end
     end
   end

data/spec/features/admin/products/stock_management_spec.rb

@@ -25,8 +25,6 @@ describe "Product Stock", type: :feature do
     # It is OK to still render the stock page, ensure no errors in this case
     context "with no stock location" do
       before do
-        @product = create(:product, name: 'apache baseball cap', price: 10)
-        @product.variants.create!(sku: 'FOOBAR')
         Spree::StockLocation.destroy_all
         find_by_id('content-header').click_link('Products')
         within_row(1) do
@@ -77,7 +75,7 @@ describe "Product Stock", type: :feature do
         visit current_url
         within('.variant-stock-items', text: variant.sku) do
           fill_in "variant-count-on-hand-#{variant.id}", with: '3'
-          targetted_select2_search "Other location", from: "#s2id_variant-stock-location-#{variant.id}"
+          select "Other location", from: "stock_location_id"
           click_icon(:plus)
         end
         expect(page).to have_content('Created successfully')

data/spec/features/admin/products/variant_spec.rb

@@ -48,4 +48,24 @@ describe "Variants", type: :feature do
       end
     end
   end
+
+  context "editing existent variant" do
+    let!(:variant) { create(:variant, product: product) }
+
+    context "if product has an option type" do
+      let!(:option_type) { create(:option_type) }
+      let!(:option_value) { create(:option_value, option_type: option_type) }
+
+      before do
+        product.option_types << option_type
+        variant.option_values << option_value
+      end
+
+      it "page has a field for editing the option value", js: true do
+        visit spree.edit_admin_product_variant_path(product, variant)
+        expect(page).to have_css("label", text: option_type.presentation)
+        expect(page).to have_select('Size', selected: 'S')
+      end
+    end
+  end
 end

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -8,6 +8,7 @@ describe "Promotion Adjustments", type: :feature, js: true do
       visit spree.admin_path
       click_link "Promotions"
       click_link "New Promotion"
+      expect(page).to have_title("New Promotion - Promotions")
     end
 
     it "should allow an admin to create a flat rate discount coupon promo" do
@@ -15,23 +16,23 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Promotion Code", with: "order"
 
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Item total", from: "Add rule of type"
+      select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
+      select "Flat Rate", from: "Base Calculator"
       within('#actions_container') { click_button "Update" }
 
       within('.calculator-fields') { fill_in "Amount", with: 5 }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.codes.first.value).to eq("order")
 
       first_rule = promotion.rules.first
@@ -51,16 +52,16 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Promotion Code", with: "single_use"
 
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
+      select "Flat Rate", from: "Base Calculator"
       within('#actions_container') { click_button "Update" }
       within('#action_fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.usage_limit).to eq(1)
       expect(promotion.codes.first.value).to eq("single_use")
 
@@ -75,22 +76,22 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Item total", from: "Add rule of type"
+      select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
 
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Percent", from: "Calculator"
+      select "Flat Percent", from: "Base Calculator"
       within('#actions_container') { click_button "Update" }
       within('.calculator-fields') { fill_in "Flat Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.codes.first).to be_nil
 
       first_rule = promotion.rules.first
@@ -110,21 +111,21 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Product(s)", from: "Add rule of type"
+      select "Product(s)", from: "Add rule of type"
       within("#rule_fields") { click_button "Add" }
       select2_search "RoR Mug", from: "Choose products"
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create per-line-item adjustment", from: "Add action of type"
+      select "Create per-line-item adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Percent Per Item", from: "Calculator"
+      select "Percent Per Item", from: "Base Calculator"
       within('#actions_container') { click_button "Update" }
       within('.calculator-fields') { fill_in "Percent", with: "10" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.codes.first).to be_nil
 
       first_rule = promotion.rules.first
@@ -142,18 +143,18 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Item total", from: "Add rule of type"
+      select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(30)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Free shipping", from: "Add action of type"
+      select "Free shipping", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
       expect(page).to have_content('Makes all shipments for the order free')
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.codes).to be_empty
       expect(promotion.rules.first).to be_a(Spree::Promotion::Rules::ItemTotal)
       expect(promotion.actions.first).to be_a(Spree::Promotion::Actions::FreeShipping)
@@ -163,9 +164,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion).to be_apply_automatically
       expect(promotion.path).to be_nil
       expect(promotion.codes).to be_empty
@@ -177,9 +178,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
       choose "URL Path"
       fill_in "Path", with: "content/cvv"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.path).to eq("content/cvv")
       expect(promotion).not_to be_apply_automatically
       expect(promotion.codes).to be_empty
@@ -192,9 +193,9 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Base code", with: "testing"
       fill_in "Number of codes", with: "10"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
       expect(promotion.path).to be_nil
       expect(promotion).not_to be_apply_automatically
       expect(promotion.rules).to be_blank
@@ -206,21 +207,21 @@ describe "Promotion Adjustments", type: :feature, js: true do
       fill_in "Name", with: "Promotion"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_content("PromotionsPromotion")
+      expect(page).to have_title("Promotion - Promotions")
 
-      select2 "Item total", from: "Add rule of type"
+      select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
       find('[id$=_preferred_amount]').set(50)
       within('#rule_fields') { click_button "Update" }
 
-      select2 "Create whole-order adjustment", from: "Add action of type"
+      select "Create whole-order adjustment", from: "Add action of type"
       within('#action_fields') { click_button "Add" }
-      select2 "Flat Rate", from: "Calculator"
+      select "Flat Rate", from: "Base Calculator"
       within('#actions_container') { click_button "Update" }
       within('.calculator-fields') { fill_in "Amount", with: "5" }
       within('#actions_container') { click_button "Update" }
 
-      promotion = Spree::Promotion.find_by_name("Promotion")
+      promotion = Spree::Promotion.find_by(name: "Promotion")
 
       first_rule = promotion.rules.first
       expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)

data/spec/features/admin/promotions/option_value_rule_spec.rb

@@ -14,7 +14,7 @@ feature 'Promotion with option value rule' do
   end
 
   scenario "adding an option value rule", js: true do
-    select2 "Option Value(s)", from: "Add rule of type"
+    select "Option Value(s)", from: "Add rule of type"
     within("#rules_container") { click_button "Add" }
 
     within("#rules_container .promotion-block") do
@@ -42,7 +42,7 @@ feature 'Promotion with option value rule' do
       option_value.update!(name: xss_string)
     end
     scenario "adding an option value rule", js: true do
-      select2 "Option Value(s)", from: "Add rule of type"
+      select "Option Value(s)", from: "Add rule of type"
       within("#rules_container") { click_button "Add" }
 
       within("#rules_container .promotion-block") do

data/spec/features/admin/promotions/product_rule_spec.rb

@@ -10,7 +10,7 @@ feature 'Promotion with product rule', js: true do
   given(:promotion) { create :promotion }
 
   def add_promotion_rule_of_type(type)
-    select2 type, from: "Add rule of type"
+    select type, from: "Add rule of type"
     within("#rules_container") { click_button "Add" }
   end
 

data/spec/features/admin/promotions/tiered_calculator_spec.rb

@@ -10,10 +10,10 @@ feature "Tiered Calculator Promotions" do
   end
 
   scenario "adding a tiered percent calculator", js: true do
-    select2 "Create whole-order adjustment", from: "Add action of type"
+    select "Create whole-order adjustment", from: "Add action of type"
     within('#action_fields') { click_button "Add" }
 
-    select2 "Tiered Percent", from: "Calculator"
+    select "Tiered Percent", from: "Base Calculator"
     within('#actions_container') { click_button "Update" }
 
     within("#actions_container .settings") do

data/spec/features/admin/promotions/user_rule_spec.rb

@@ -14,7 +14,7 @@ feature 'Promotion with user rule', js: true do
     let!(:other_user) { create(:user, email: 'bar@example.com') }
 
     scenario "searching a user" do
-      select2 "User", from: "Add rule of type"
+      select "User", from: "Add rule of type"
       within("#rules_container") { click_button "Add" }
 
       select2_search "foo", from: "Choose users", select: false
@@ -29,7 +29,7 @@ feature 'Promotion with user rule', js: true do
     given!(:user) { create(:user, email: xss_string) }
 
     scenario "adding an option value rule" do
-      select2 "User", from: "Add rule of type"
+      select "User", from: "Add rule of type"
       within("#rules_container") { click_button "Add" }
 
       select2_search "<script>", from: "Choose users"

data/spec/features/admin/stock_transfer_spec.rb

@@ -16,19 +16,19 @@ describe 'Stock Transfers', type: :feature, js: true do
       create(:stock_location, name: 'SF')
 
       visit spree.new_admin_stock_transfer_path
-      select "SF", from: 'stock_transfer[source_location_id]', visible: false
-      fill_in 'stock_transfer_description', with: description
+      select "SF", from: 'Source Location'
+      fill_in 'Description', with: description
       click_button 'Continue'
 
       expect(page).to have_field('stock_transfer_description', with: description)
 
-      select "NY", from: 'stock_transfer[destination_location_id]', visible: false
+      select "NY", from: 'Destination Location'
       within "form.edit_stock_transfer" do
         page.find('button').trigger('click')
       end
 
       expect(page).to have_content('Stock Transfer has been successfully updated')
-      expect(page).to have_content("NY")
+      expect(page).to have_select("Destination Location", selected: 'NY')
     end
 
     # Regression spec for Solidus issue #1087
@@ -36,7 +36,7 @@ describe 'Stock Transfers', type: :feature, js: true do
       create(:stock_location_with_items, name: 'NY')
       create(:stock_location, name: 'SF')
       visit spree.new_admin_stock_transfer_path
-      fill_in 'stock_transfer_description', with: description
+      fill_in 'Description', with: description
       click_button 'Continue'
 
       expect(page).to have_content("Source location can't be blank")
@@ -65,8 +65,8 @@ describe 'Stock Transfers', type: :feature, js: true do
     let(:stock_transfer) { create(:stock_transfer_with_items) }
 
     before do
-      stock_transfer.transfer_items do |item|
-        item.update_attributes(expected_quantity: 1)
+      stock_transfer.transfer_items.each do |item|
+        item.update_attributes!(expected_quantity: 1)
       end
     end
 
@@ -85,7 +85,10 @@ describe 'Stock Transfers', type: :feature, js: true do
     describe 'with enough stock' do
       it 'ships stock transfer' do
         visit spree.tracking_info_admin_stock_transfer_path(stock_transfer)
-        click_on 'Ship'
+
+        accept_confirm Spree.t('ship_stock_transfer.confirm') do
+          click_on 'Ship'
+        end
 
         expect(page).to have_current_path(spree.admin_stock_transfers_path)
         expect(stock_transfer.reload.shipped_at).to_not be_nil