solidus_backend 2.4.2 → 2.5.0.beta1

data/spec/features/admin/orders/payments_spec.rb

@@ -62,11 +62,11 @@ describe 'Payments', type: :feature do
       expect(page).to have_content 'my cc address'
     end
 
-    it 'lists and create payments for an order', js: true do
+    it 'lists, updates and creates payments for an order', js: true do
       within_row(1) do
-        expect(column_text(3)).to eq('$150.00')
-        expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('Checkout')
+        expect(column_text(3)).to eq('Credit Card')
+        expect(column_text(5)).to eq('Checkout')
+        expect(column_text(6)).to have_content('$150.00')
       end
 
       click_icon :void
@@ -74,9 +74,7 @@ describe 'Payments', type: :feature do
       expect(page).to have_content('Payment Updated')
 
       within_row(1) do
-        expect(column_text(3)).to eq('$150.00')
-        expect(column_text(4)).to eq('Credit Card')
-        expect(column_text(6)).to eq('Void')
+        expect(column_text(5)).to eq('Void')
       end
 
       click_on 'New Payment'
@@ -135,7 +133,6 @@ describe 'Payments', type: :feature do
           click_icon(:save)
         end
         expect(page).to have_selector('.flash.error', text: 'Invalid resource. Please fix errors and try again.')
-        expect(page).to have_field('amount', with: 'invalid')
         expect(payment.reload.amount).to eq(150.00)
       end
     end
@@ -228,7 +225,7 @@ describe 'Payments', type: :feature do
       end
 
       before do
-        payment_method.destroy
+        payment_method.discard
         visit spree.admin_order_payments_path(order.reload)
       end
 
@@ -287,7 +284,7 @@ describe 'Payments', type: :feature do
       fill_in "Expiration", with: "09 / #{Time.current.year + 1}"
       fill_in "Card Code", with: "007"
       click_button "Continue"
-      expect(page).to have_content Spree.t(:insufficient_stock_for_order)
+      expect(page).to have_content I18n.t('spree.insufficient_stock_for_order')
     end
   end
 end

data/spec/features/admin/orders/shipments_spec.rb

@@ -39,7 +39,9 @@ describe "Shipments", type: :feature do
 
     it "can ship a completed order" do
       expect {
-        ship_shipment
+        perform_enqueued_jobs {
+          ship_shipment
+        }
       }.to change{ ActionMailer::Base.deliveries.count }.by(1)
     end
 
@@ -47,7 +49,9 @@ describe "Shipments", type: :feature do
       uncheck 'Send Mailer'
 
       expect {
-        ship_shipment
+        perform_enqueued_jobs {
+          ship_shipment
+        }
       }.not_to change{ ActionMailer::Base.deliveries.count }
     end
   end
@@ -67,7 +71,7 @@ describe "Shipments", type: :feature do
       expect(order.shipments.count).to eq(1)
       shipment1 = order.shipments[0]
 
-      within_row(1) { click_icon 'arrows-h' }
+      within('tr', text: order.line_items[0].sku) { click_icon 'arrows-h' }
       complete_split_to('LA')
 
       expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 4)
@@ -77,7 +81,7 @@ describe "Shipments", type: :feature do
         expect(page).to have_content("UPS Ground")
       end
 
-      within_row(2) { click_icon 'arrows-h' }
+      within('tr', text: order.line_items[1].sku) { click_icon 'arrows-h' }
       complete_split_to("LA(#{shipment2.number})")
       expect(page).to have_css("#shipment_#{shipment2.id} tr.stock-item", count: 2)
       expect(page).to have_css("#shipment_#{shipment1.id} tr.stock-item", count: 3)
@@ -100,7 +104,7 @@ describe "Shipments", type: :feature do
       it "can transfer all items to a new location" do
         expect(order.shipments.count).to eq(1)
 
-        within_row(1) { click_icon 'arrows-h' }
+        within('tr', text: order.line_items[0].sku) { click_icon 'arrows-h' }
         complete_split_to('LA', quantity: 5)
 
         expect(page).to_not have_content("package from 'NY Warehouse'")

data/spec/features/admin/payments/store_credits_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 RSpec.describe 'Store credits', type: :feature do
   stub_authorization!
 
-  let(:order) { FactoryGirl.create(:completed_order_with_totals) }
+  let(:order) { FactoryBot.create(:completed_order_with_totals) }
   let(:payment) do
-    FactoryGirl.create(
+    FactoryBot.create(
       :store_credit_payment,
       order: order,
       amount: 20

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

@@ -52,85 +52,6 @@ describe "Product Images", type: :feature do
     end
   end
 
-  context 'Via the upload zone', js: true do
-    before do
-      create(:variant, product: product)
-    end
-
-    it "uploads an image with ajax and appends it to the images table" do
-      visit spree.admin_product_images_path(product)
-      expect(page).to have_content("No images found")
-
-      within_fieldset 'Upload Images' do
-        # Can also pass multiple files in the array, but SQLite gives a deadlock on insert
-        attach_file('image_attachment', [file_path], visible: false)
-      end
-
-      expect(page).not_to have_content("No images found")
-
-      within("table.index") do
-        expect(page).to have_css "tbody tr", count: 1
-
-        within("tbody") do
-          expect(page).to have_xpath "//img[contains(@src,'ror_ringer')]"
-          expect(page).to have_content "All"
-        end
-
-        # Change the image to the other variant
-        targetted_select2 "Size: S", from: "#s2id_image_viewable_id"
-        click_icon :check
-        expect(page).to have_content "Size: S"
-      end
-
-      expect(Spree::Image.last.viewable).to eq(product.master)
-    end
-  end
-
-  it "should see variant images and allow for inline changing the image's variant", js: true do
-    variant = create(:variant)
-    variant.images.create!(attachment: File.open(file_path))
-    visit spree.admin_product_images_path(variant.product)
-
-    expect(page).not_to have_content("No Images Found.")
-
-    within("table.index") do
-      expect(page).to have_content(variant.options_text)
-
-      # ensure no duplicate images are displayed
-      expect(page).to have_css("tbody tr", count: 1)
-
-      # ensure variant header is displayed
-      within("thead") do
-        expect(page).to have_content("Variant")
-      end
-
-      within("tbody") do
-        expect(page).to have_content("Size: S")
-      end
-
-      # Do an inline change of variant and alt
-      targetted_select2 "All", from: "#s2id_image_viewable_id"
-      fill_in 'image[alt]', with: 'ruby on rails t-shirt'
-      click_icon :check
-
-      expect(page).to have_content "All"
-      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
-
-      # test escape
-      find("#image_alt").click # to focus
-      fill_in 'image[alt]', with: 'red shirt'
-      find("#image_alt").send_keys(:escape)
-      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
-
-      # And then go back to Size S variant, but using Enter key
-      targetted_select2 "Size: S", from: "#s2id_image_viewable_id"
-      find("#s2id_image_viewable_id").send_keys(:return)
-
-      expect(page).to have_content "Size: S"
-      expect(page).to have_field "image[alt]", with: "ruby on rails t-shirt"
-    end
-  end
-
   it "should not see variant column when product has no variants" do
     product = create(:product)
     product.images.create!(attachment: File.open(file_path))

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

@@ -10,7 +10,7 @@ describe "Products", type: :feature do
     end
 
     def build_option_type_with_values(name, values)
-      ot = FactoryGirl.create(:option_type, name: name)
+      ot = FactoryBot.create(:option_type, name: name)
       values.each do |val|
         ot.option_values.create(name: val.downcase, presentation: val)
       end
@@ -156,10 +156,7 @@ describe "Products", type: :feature do
       before(:each) do
         @shipping_category = create(:shipping_category)
         click_nav "Products"
-        click_link "admin_new_product"
-        within('#new_product') do
-          expect(page).to have_content("SKU")
-        end
+        click_on "New Product"
       end
 
       it "should allow an admin to create a new product", js: true do
@@ -174,7 +171,7 @@ describe "Products", type: :feature do
         expect(page).to have_content("successfully updated!")
       end
 
-      it "should show validation errors", js: true do
+      it "should show validation errors", js: false do
         fill_in "product_name", with: "Baseball Cap"
         fill_in "product_sku", with: "B100"
         fill_in "product_price", with: "100"

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

@@ -68,4 +68,21 @@ describe "Variants", type: :feature do
       end
     end
   end
+
+  context "deleting a variant", js: true do
+    let!(:variant) { create(:variant, product: product) }
+    let!(:option_type) { create(:option_type) }
+    let!(:option_value) { create(:option_value, option_type: option_type) }
+
+    it "can delete a variant" do
+      visit spree.admin_product_variants_path(product)
+      within 'tr', text: 'Size: S' do
+        accept_alert do
+          click_icon :trash
+        end
+      end
+
+      expect(page).to have_no_text('Size: S')
+    end
+  end
 end

data/spec/features/admin/promotion_adjustments_spec.rb

@@ -5,18 +5,16 @@ describe "Promotion Adjustments", type: :feature, js: true do
 
   context "creating a new promotion", js: true do
     before(:each) do
-      visit spree.admin_path
-      click_link "Promotions"
-      click_link "New Promotion"
+      visit spree.new_admin_promotion_path
       expect(page).to have_title("New Promotion - Promotions")
     end
 
     it "should allow an admin to create a flat rate discount coupon promo" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       fill_in "Promotion Code", with: "order"
 
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -25,14 +23,15 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('#rule_fields') { click_button "Update" }
 
       select "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Flat Rate", from: "Base Calculator"
-      within('#actions_container') { click_button "Update" }
-
-      within('.calculator-fields') { fill_in "Amount", with: 5 }
+      within('#action_fields') do
+        click_button "Add"
+        select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        fill_in "Amount", with: 5
+      end
       within('#actions_container') { click_button "Update" }
+      expect(page).to have_text 'successfully updated'
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.codes.first.value).to eq("order")
 
       first_rule = promotion.rules.first
@@ -47,21 +46,23 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "should allow an admin to create a single user coupon promo with flat rate discount" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       fill_in "promotion[usage_limit]", with: "1"
       fill_in "Promotion Code", with: "single_use"
 
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Flat Rate", from: "Base Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('#action_fields') { fill_in "Amount", with: "5" }
+      within('#action_fields') do
+        click_button "Add"
+        select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        fill_in "Amount", with: "5"
+      end
       within('#actions_container') { click_button "Update" }
+      expect(page).to have_text 'successfully updated'
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.usage_limit).to eq(1)
       expect(promotion.codes.first.value).to eq("single_use")
 
@@ -73,10 +74,10 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "should allow an admin to create an automatic promo with flat percent discount" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -85,13 +86,15 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('#rule_fields') { click_button "Update" }
 
       select "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Flat Percent", from: "Base Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Flat Percent", with: "10" }
+      within('#action_fields') do
+        click_button "Add"
+        select "Flat Percent", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        fill_in "Flat Percent", with: "10"
+      end
       within('#actions_container') { click_button "Update" }
+      expect(page).to have_text 'successfully updated'
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.codes.first).to be_nil
 
       first_rule = promotion.rules.first
@@ -108,10 +111,10 @@ describe "Promotion Adjustments", type: :feature, js: true do
     it "should allow an admin to create an product promo with percent per item discount" do
       create(:product, name: "RoR Mug")
 
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Product(s)", from: "Add rule of type"
       within("#rule_fields") { click_button "Add" }
@@ -119,13 +122,15 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('#rule_fields') { click_button "Update" }
 
       select "Create per-line-item adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Percent Per Item", from: "Base Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Percent", with: "10" }
+      within('#action_fields') do
+        click_button "Add"
+        select "Percent Per Item", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        fill_in "Percent", with: "10"
+      end
       within('#actions_container') { click_button "Update" }
+      expect(page).to have_text 'successfully updated'
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.codes.first).to be_nil
 
       first_rule = promotion.rules.first
@@ -140,10 +145,10 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "should allow an admin to create an automatic promotion with free shipping (no code)" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -154,19 +159,19 @@ describe "Promotion Adjustments", type: :feature, js: true do
       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: "SAVE SAVE SAVE")
       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)
     end
 
     it "should allow an admin to create an automatic promotion" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion).to be_apply_automatically
       expect(promotion.path).to be_nil
       expect(promotion.codes).to be_empty
@@ -174,13 +179,13 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "should allow an admin to create a promo requiring a landing page to be visited" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "URL Path"
       fill_in "Path", with: "content/cvv"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.path).to eq("content/cvv")
       expect(promotion).not_to be_apply_automatically
       expect(promotion.codes).to be_empty
@@ -188,14 +193,17 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "should allow an admin to create a promo with generated codes" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Multiple promotion codes"
       fill_in "Base code", with: "testing"
       fill_in "Number of codes", with: "10"
-      click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      perform_enqueued_jobs {
+        click_button "Create"
+        expect(page).to have_title("SAVE SAVE SAVE - Promotions")
+      }
+
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
       expect(promotion.path).to be_nil
       expect(promotion).not_to be_apply_automatically
       expect(promotion.rules).to be_blank
@@ -204,10 +212,10 @@ describe "Promotion Adjustments", type: :feature, js: true do
     end
 
     it "ceasing to be eligible for a promotion with item total rule then becoming eligible again" do
-      fill_in "Name", with: "Promotion"
+      fill_in "Name", with: "SAVE SAVE SAVE"
       choose "Apply to all orders"
       click_button "Create"
-      expect(page).to have_title("Promotion - Promotions")
+      expect(page).to have_title("SAVE SAVE SAVE - Promotions")
 
       select "Item total", from: "Add rule of type"
       within('#rule_fields') { click_button "Add" }
@@ -215,13 +223,15 @@ describe "Promotion Adjustments", type: :feature, js: true do
       within('#rule_fields') { click_button "Update" }
 
       select "Create whole-order adjustment", from: "Add action of type"
-      within('#action_fields') { click_button "Add" }
-      select "Flat Rate", from: "Base Calculator"
-      within('#actions_container') { click_button "Update" }
-      within('.calculator-fields') { fill_in "Amount", with: "5" }
+      within('#action_fields') do
+        click_button "Add"
+        select "Flat Rate", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        fill_in "Amount", with: "5"
+      end
       within('#actions_container') { click_button "Update" }
+      expect(page).to have_text 'successfully updated'
 
-      promotion = Spree::Promotion.find_by(name: "Promotion")
+      promotion = Spree::Promotion.find_by(name: "SAVE SAVE SAVE")
 
       first_rule = promotion.rules.first
       expect(first_rule.class).to eq(Spree::Promotion::Rules::ItemTotal)
@@ -232,5 +242,48 @@ describe "Promotion Adjustments", type: :feature, js: true do
       expect(first_action.calculator.class).to eq(Spree::Calculator::FlatRate)
       expect(first_action.calculator.preferred_amount).to eq(5)
     end
+
+    context 'creating a promotion with promotion action that has a calculator with complex preferences' do
+      before do
+        class ComplexCalculator < Spree::Calculator
+          preference :amount, :decimal
+          preference :currency, :string
+          preference :mapping, :hash
+          preference :list, :array
+
+          def self.description
+            "Complex Calculator"
+          end
+        end
+        @calculators = Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments
+        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = [ComplexCalculator]
+      end
+
+      after do
+        Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments = @calculators
+      end
+
+      it "does not show array and hash form fields" do
+        fill_in "Name", with: "SAVE SAVE SAVE"
+        choose "Apply to all orders"
+        click_button "Create"
+        expect(page).to have_title("SAVE SAVE SAVE - Promotions")
+
+        select "Create per-line-item adjustment", from: "Add action of type"
+        within('#action_fields') do
+          click_button "Add"
+          select "Complex Calculator", from: I18n.t('spree.admin.promotions.actions.calculator_label')
+        end
+        within('#actions_container') { click_button "Update" }
+        expect(page).to have_text 'successfully updated'
+
+        within('#action_fields') do
+          expect(page).to have_field('Amount')
+          expect(page).to have_field('Currency')
+          expect(page).to_not have_field('Mapping')
+          expect(page).to_not have_field('List')
+        end
+      end
+    end
   end
 end