solidus_backend 2.1.1 → 2.2.0.beta1

data/lib/spree/backend.rb

@@ -4,7 +4,6 @@ require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'sass-rails'
 require 'bourbon'
-require 'select2-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'
 

data/lib/spree/backend/engine.rb

@@ -6,11 +6,6 @@ module Spree
       initializer "spree.backend.environment", before: :load_config_initializers do |_app|
         Spree::Backend::Config = Spree::BackendConfiguration.new
       end
-
-      # filter sensitive information during logging
-      initializer "spree.params.filter" do |app|
-        app.config.filter_parameters += [:password, :password_confirmation, :number]
-      end
     end
   end
 end

data/solidus_backend.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'bourbon', '>= 4', '< 6'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'jquery-ui-rails', '~> 5.0.0'
-  s.add_dependency 'select2-rails',   '3.5.9.1' # 3.5.9.2 breaks forms
   s.add_dependency 'font-awesome-rails', '~> 4.0'
 
   s.add_dependency 'handlebars_assets', '~> 0.23'

data/spec/controllers/spree/admin/payments_controller_spec.rb

@@ -13,7 +13,7 @@ module Spree
       describe '#create' do
         context "with a valid credit card" do
           let(:order) { create(:order_with_line_items, state: "payment") }
-          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true, available_to_users: false) }
+          let(:payment_method) { create(:credit_card_payment_method, available_to_admin: true) }
           let(:attributes) do
             {
               order_id: order.number,
@@ -75,14 +75,28 @@ module Spree
       describe '#new' do
         # Regression test for https://github.com/spree/spree/issues/3233
         context "with a backend payment method" do
-          before do
-            @payment_method = create(:check_payment_method, available_to_admin: true)
+          context "and the payment method is active" do
+            before do
+              @payment_method = create(:check_payment_method, available_to_admin: true)
+            end
+
+            it "loads the payment method" do
+              get :new, params: { order_id: order.number }
+              expect(response.status).to eq(200)
+              expect(assigns[:payment_methods]).to include(@payment_method)
+            end
           end
 
-          it "loads backend payment methods" do
-            get :new, params: { order_id: order.number }
-            expect(response.status).to eq(200)
-            expect(assigns[:payment_methods]).to include(@payment_method)
+          context "and the payment method is inactive" do
+            before do
+              @payment_method = create(:check_payment_method, available_to_admin: true, active: false)
+            end
+
+            it "does not load the payment method" do
+              get :new, params: { order_id: order.number }
+              expect(response.status).to eq(200)
+              expect(assigns[:payment_methods]).to be_empty
+            end
           end
         end
       end

data/spec/controllers/spree/admin/promotions_controller_spec.rb

@@ -46,52 +46,46 @@ describe Spree::Admin::PromotionsController, type: :controller do
     let(:params) { { promotion: { name: 'some promo' } } }
 
     context "it succeeds" do
-      it "creates a promotion" do
-        expect { subject }.to change { Spree::Promotion.count }.by(1)
-      end
+      context "with no single code param" do
+        it "creates a promotion" do
+          expect { subject }.to change { Spree::Promotion.count }.by(1)
+        end
 
-      it "sets the flash message" do
-        subject
-        expect(flash[:success]).to eq "Promotion has been successfully created!"
-      end
+        it "sets the flash message" do
+          subject
+          expect(flash[:success]).to eq "Promotion has been successfully created!"
+        end
 
-      it "redirects to promotion edit" do
-        subject
-        expect(response).to redirect_to "http://test.host/admin/promotions/#{assigns(:promotion).id}/edit"
-      end
+        it "redirects to promotion edit" do
+          subject
+          expect(response).to redirect_to "http://test.host/admin/promotions/#{assigns(:promotion).id}/edit"
+        end
 
-      context "with one promo codes" do
-        let(:params) do
-          super().merge(promotion_builder: { base_code: 'abc', number_of_codes: 1 })
+        it "doesn't create any promotion codes" do
+          expect { subject }.to_not change { Spree::PromotionCode.count }
         end
+      end
 
-        it "succeeds and creates one code" do
-          expect {
-            expect {
-              subject
-            }.to change { Spree::Promotion.count }.by(1)
-          }.to change { Spree::PromotionCode.count }.by(1)
+      context "with a single code" do
+        let(:params) { { promotion: { name: 'some promo' }, single_code: "promo" } }
 
-          expect(assigns(:promotion).codes.first.value).to eq 'abc'
+        it "creates a promotion" do
+          expect { subject }.to change { Spree::Promotion.count }.by(1)
         end
-      end
 
-      context "with multiple promo codes" do
-        let(:params) do
-          super().merge(promotion_builder: { base_code: 'abc', number_of_codes: 2 })
+        it "sets the flash message" do
+          subject
+          expect(flash[:success]).to eq "Promotion has been successfully created!"
+        end
+
+        it "redirects to promotion edit" do
+          subject
+          expect(response).to redirect_to "http://test.host/admin/promotions/#{assigns(:promotion).id}/edit"
         end
 
-        it "succeeds and creates multiple codes" do
-          expect {
-            expect {
-              subject
-            }.to change { Spree::Promotion.count }.by(1)
-          }.to change { Spree::PromotionCode.count }.by(2)
-
-          codes = assigns(:promotion).codes.map(&:value).sort
-          expect(codes.length).to be 2
-          expect(codes[0]).to match(/abc_[a-z]{6}/)
-          expect(codes[1]).to match(/abc_[a-z]{6}/)
+        it "creates a promotion code" do
+          expect { subject }.to change { Spree::PromotionCode.count }.by(1)
+          expect(Spree::PromotionCode.last.value).to eq("promo")
         end
       end
     end

data/spec/controllers/spree/admin/store_credits_controller_spec.rb

@@ -51,6 +51,7 @@ describe Spree::Admin::StoreCreditsController do
           user_id: user.id,
           store_credit: {
             amount: 1.00,
+            currency: "USD",
             category_id: a_credit_category.id
           }
         }

data/spec/controllers/spree/admin/users_controller_spec.rb

@@ -149,9 +149,17 @@ describe Spree::Admin::UsersController, type: :controller do
       it "can clear roles" do
         user.spree_roles << dummy_role
         expect {
-          put :update, params: { id: user.id, user: { first_name: "Bob", spree_role_ids: [] } }
+          put :update, params: { id: user.id, user: { first_name: "Bob", spree_role_ids: [""] } }
         }.to change { user.reload.spree_roles.to_a }.to([])
       end
+
+      context 'when no role params are present' do
+        it 'does not clear all present user roles' do
+          user.spree_roles << dummy_role
+          put :update, params: { id: user.id, user: { first_name: "Bob" } }
+          expect(user.reload.spree_roles).to_not be_empty
+        end
+      end
     end
 
     context "when the user cannot manage roles" do

data/spec/features/admin/configuration/payment_methods_spec.rb

@@ -35,7 +35,7 @@ describe "Payment Methods", type: :feature do
       expect(page).to have_content("New Payment Method")
       fill_in "payment_method_name", with: "check90"
       fill_in "payment_method_description", with: "check90 desc"
-      select "PaymentMethod::Check", from: "gtwy-type"
+      select "Spree::PaymentMethod::Check", from: "gtwy-type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end

data/spec/features/admin/configuration/shipping_methods_spec.rb

@@ -5,16 +5,7 @@ describe "Shipping Methods", type: :feature do
   let!(:zone) { create(:global_zone) }
   let!(:shipping_method) { create(:shipping_method, zones: [zone]) }
 
-  after do
-    Capybara.ignore_hidden_elements = true
-  end
-
   before do
-    Capybara.ignore_hidden_elements = false
-    # HACK: To work around no email prompting on check out
-    allow_any_instance_of(Spree::Order).to receive_messages(require_email: false)
-    create(:check_payment_method)
-
     visit spree.admin_path
     click_link "Settings"
     click_link "Shipping"
@@ -31,7 +22,7 @@ describe "Shipping Methods", type: :feature do
     end
   end
 
-  context "create" do
+  context "create", js: true do
     it "should be able to create a new shipping method" do
       click_link "New Shipping Method"
 
@@ -48,17 +39,34 @@ describe "Shipping Methods", type: :feature do
 
   # Regression test for https://github.com/spree/spree/issues/1331
   context "update" do
+    it "can update the existing calculator", js: true do
+      within("#listing_shipping_methods") do
+        click_icon :edit
+      end
+
+      fill_in 'Amount', with: 20
+
+      click_button "Update"
+
+      expect(page).to have_content 'successfully updated'
+      expect(page).to have_field 'Amount', with: '20.0'
+    end
+
     it "can change the calculator", js: true do
       within("#listing_shipping_methods") do
         click_icon :edit
       end
 
-      expect(find(:css, ".calculator-settings-warning")).not_to be_visible
       select2_search('Flexible Rate', from: 'Calculator')
-      expect(find(:css, ".calculator-settings-warning")).to be_visible
+
+      fill_in 'First Item', with: 10
+      fill_in 'Additional Item', with: 20
 
       click_button "Update"
-      expect(page).not_to have_content("Shipping method is not found")
+
+      expect(page).to have_content 'successfully updated'
+      expect(page).to have_field 'First Item', with: '10.0'
+      expect(page).to have_field 'Additional Item', with: '20.0'
     end
   end
 end

data/spec/features/admin/configuration/stock_locations_spec.rb

@@ -29,8 +29,9 @@ describe "Stock Locations", type: :feature do
     accept_alert do
       click_icon :trash
     end
-    # Wait for API request to complete.
-    wait_for_ajax
+
+    expect(page).to have_content('Stock Location "NY Warehouse" has been successfully removed')
+
     visit current_path
     expect(page).to have_content("No Stock Locations found")
   end

data/spec/features/admin/configuration/{general_settings_spec.rb → store_spec.rb}

@@ -14,13 +14,12 @@ describe "Store", type: :feature, js: true do
     visit spree.admin_path
     click_link "Settings"
     within('.admin-nav') do
-      click_link "Store"
+      click_link "Stores"
     end
   end
 
   context "visiting general store settings" do
     it "should have the right content" do
-      expect(page).to have_content("SettingsStore")
       expect(page).to have_field("store_name", with: "Test Store")
       expect(page).to have_field("store_url", with: "test.example.org")
       expect(page).to have_field("store_mail_from_address", with: "test@example.org")
@@ -33,29 +32,29 @@ describe "Store", type: :feature, js: true do
       fill_in "store_mail_from_address", with: "spree@example.org"
       click_button "Update"
 
-      assert_successful_update_message(:general_settings)
+      expect(page).to have_content "successfully updated"
       expect(page).to have_field("store_name", with: "Spree Demo Site99")
       expect(page).to have_field("store_mail_from_address", with: "spree@example.org")
     end
 
     it "should be able to update the default cart tax country" do
-      expect(page).to have_select("Tax Country for Empty Carts", selected: "No taxes on carts without address")
+      expect(page).to have_select('Tax Country for Empty Carts', selected: 'No taxes on carts without address', visible: false)
 
-      select "Germany", from: "Tax Country for Empty Carts"
+      select "Germany", from: "Tax Country for Empty Carts", visible: false
       click_button "Update"
 
-      assert_successful_update_message(:general_settings)
-      expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany")
+      expect(page).to have_content("has been successfully updated")
+      expect(page).to have_select("Tax Country for Empty Carts", selected: "Germany", visible: false)
     end
   end
 
   context "update fails" do
     it "should display the error" do
-      fill_in "Site Name", with: ""
+      fill_in "Site Name", with: " "
       click_button "Update"
 
       expect(page).to have_content("can't be blank")
-      expect(page).to have_field("Site Name", with: "")
+      expect(page).to have_field("Site Name", with: " ")
     end
   end
 end

data/spec/features/admin/javascript_format_money_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe 'JS Spree.formatMoney', js: true do
+  stub_authorization!
+
+  # This is a slightly hacky spec to ensure that our JS will format money in
+  # the same was as our ruby code.
+  # This should probably replaced with a pure JS test in the future.
+  it 'should behave identically to Spree::Money#to_s' do
+    visit '/admin'
+
+    Money::Currency.all.map(&:id).map(&:to_s).map(&:upcase).uniq.each do |currency|
+      money = Spree::Money.new(1234, currency: currency)
+
+      js_result = page.evaluate_script("Spree.formatMoney(#{money.to_d}, '#{currency}')")
+
+      expect(js_result).to eq money.to_s
+    end
+  end
+end

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

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe "Customer Details", type: :feature, js: true do
+  include OrderFeatureHelper
+
   stub_authorization!
 
   let(:country) { create(:country, name: "Kangaland") }
@@ -23,11 +25,9 @@ describe "Customer Details", type: :feature, js: true do
       click_link "Orders"
       click_link "New Order"
       click_on 'Cart'
-      select2_search product.name, from: Spree.t(:name_or_sku)
-      within("table.stock-levels") do
-        find('.variant_quantity').set(quantity)
-      end
-      click_button 'Add'
+
+      add_line_item product.name, quantity: quantity
+
       expect(page).to have_css('.line-item')
       click_link "Customer"
       targetted_select2 "foobar@example.com", from: "#s2id_customer_search"
@@ -41,9 +41,9 @@ describe "Customer Details", type: :feature, js: true do
       expect(page).to have_field('Street Address', with: user.bill_address.address1)
       expect(page).to have_field("Street Address (cont'd)", with: user.bill_address.address2)
       expect(page).to have_field('City', with: user.bill_address.city)
-      expect(page).to have_field('Zip', with: user.bill_address.zipcode)
-      expect(page).to have_field('Country', with: user.bill_address.country_id)
-      expect(page).to have_field('State', with: user.bill_address.state_id)
+      expect(page).to have_field('Zip Code', with: user.bill_address.zipcode)
+      expect(page).to have_select('Country', selected: "United States of America", visible: false)
+      expect(page).to have_select('State', selected: user.bill_address.state.name, visible: false)
       expect(page).to have_field('Phone', with: user.bill_address.phone)
       click_button "Update"
       expect(Spree::Order.last.user).not_to be_nil
@@ -137,7 +137,7 @@ describe "Customer Details", type: :feature, js: true do
 
       it "sets default country when displaying form" do
         click_link "Customer"
-        expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id)
+        expect(page).to have_field("order_bill_address_attributes_country_id", with: brazil.id, visible: false)
       end
     end
 
@@ -158,13 +158,17 @@ describe "Customer Details", type: :feature, js: true do
         fill_in "order_ship_address_attributes_city",       with: "Bethesda"
         fill_in "order_ship_address_attributes_zipcode",    with: "20170"
 
-        page.select('Alabama', from: 'order_ship_address_attributes_state_id')
+        select_state('Alabama', 'ship')
         fill_in "order_ship_address_attributes_phone", with: "123-456-7890"
         click_button "Update"
       end
     end
   end
 
+  def select_state(state_name, kind = "bill")
+    targetted_select2 state_name, from: "#s2id_order_#{kind}_address_attributes_state_id"
+  end
+
   def fill_in_address(kind = "bill")
     fill_in "First Name",              with: "John 99"
     fill_in "Last Name",               with: "Doe"
@@ -172,8 +176,8 @@ describe "Customer Details", type: :feature, js: true do
     fill_in "Street Address",          with: "100 first lane"
     fill_in "Street Address (cont'd)", with: "#101"
     fill_in "City",                    with: "Bethesda"
-    fill_in "Zip",                     with: "20170"
-    targetted_select2 "Alabama",       from: "#s2id_order_#{kind}_address_attributes_state_id"
+    fill_in "Zip Code",                with: "20170"
+    select_state("Alabama", kind)
     fill_in "Phone",                   with: "123-456-7890"
   end
 end

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

@@ -17,7 +17,7 @@ describe "Order Line Items", type: :feature, js: true do
   end
 
   it "can edit a line item's quantity" do
-    visit spree.edit_admin_order_path(order)
+    visit spree.cart_admin_order_path(order)
     within(".line-items") do
       find(".edit-line-item").click
       fill_in "quantity", with: 10
@@ -32,7 +32,7 @@ describe "Order Line Items", type: :feature, js: true do
   end
 
   it "can delete a line item" do
-    visit spree.edit_admin_order_path(order)
+    visit spree.cart_admin_order_path(order)
 
     product_name = find(".line-items tr:nth-child(1) .line-item-name").text
 

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

@@ -13,6 +13,21 @@ describe "Orders Listing", type: :feature, js: true do
     visit spree.admin_orders_path
   end
 
+  it 'displays the new order button' do
+    expect(page).to have_link('New Order')
+  end
+
+  context 'without create permission' do
+    custom_authorization! do |_user|
+      can :manage, Spree::Order
+      cannot :create, Spree::Order
+    end
+
+    it 'does not display the new order button' do
+      expect(page).to_not have_link('New Order')
+    end
+  end
+
   context "listing orders" do
     it "should list existing orders" do
       within_row(1) do
@@ -30,7 +45,7 @@ describe "Orders Listing", type: :feature, js: true do
       within_row(1) { expect(page).to have_content("R100") }
       within_row(2) { expect(page).to have_content("R200") }
 
-      click_link "Completed At"
+      click_link "Completed At", exact: false
 
       # Completed at desc
       within_row(1) { expect(page).to have_content("R200") }
@@ -57,7 +72,7 @@ describe "Orders Listing", type: :feature, js: true do
       it "can find the orders belonging to a specific store" do
         main_store, other_store = stores
 
-        click_on "Filter"
+        click_on "Filter Results"
         select2 main_store.name, from: Spree.t(:store)
         click_on "Filter Results"
 
@@ -72,7 +87,7 @@ describe "Orders Listing", type: :feature, js: true do
 
     context "when there's a single store" do
       it "should be able to search orders" do
-        click_on 'Filter'
+        click_on "Filter Results"
         fill_in "q_number_cont", with: "R200"
         click_on 'Filter Results'
         within_row(1) do
@@ -84,7 +99,7 @@ describe "Orders Listing", type: :feature, js: true do
       end
 
       it "should be able to filter on variant_id" do
-        click_on 'Filter'
+        click_on "Filter Results"
         select2_search @order1.products.first.sku, from: Spree.t(:variant)
         click_on 'Filter Results'
 
@@ -108,20 +123,20 @@ describe "Orders Listing", type: :feature, js: true do
         # Regression test for https://github.com/spree/spree/issues/4004
         it "should be able to go from page to page for incomplete orders" do
           10.times { Spree::Order.create email: "incomplete@example.com" }
-          click_on 'Filter'
+          click_on "Filter Results"
           uncheck "q_completed_at_not_null"
           click_on 'Filter Results'
           within(".pagination", match: :first) do
             click_link "2"
           end
           expect(page).to have_content("incomplete@example.com")
-          click_on 'Filter'
+          click_on "Filter Results"
           expect(find("#q_completed_at_not_null")).not_to be_checked
         end
       end
 
       it "should be able to search orders using only completed at input" do
-        click_on 'Filter'
+        click_on "Filter Results"
         fill_in "q_created_at_gt", with: Date.current
 
         # Just so the datepicker gets out of poltergeists way.
@@ -145,8 +160,8 @@ describe "Orders Listing", type: :feature, js: true do
         end
 
         it "only shows the orders with the selected promotion" do
-          click_on 'Filter'
-          fill_in "q_promotions_codes_value_cont", with: promotion.codes.first.value
+          click_on "Filter Results"
+          fill_in "q_order_promotions_promotion_code_value_cont", with: promotion.codes.first.value
           click_on 'Filter Results'
           within_row(1) { expect(page).to have_content("R100") }
           within("table#listing_orders") { expect(page).not_to have_content("R200") }
@@ -160,7 +175,7 @@ describe "Orders Listing", type: :feature, js: true do
 
         it "shows both complete and incomplete orders" do
           check "q_completed_at_not_null"
-          click_on 'Filter'
+          click_on "Filter Results"
 
           expect(page).to have_content("R200")
           expect(page).to_not have_content("R300")