solidus_backend 1.2.3 → 1.3.0.beta1

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

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Spree::Admin::ShippingMethodsController, :type => :controller do
+describe Spree::Admin::ShippingMethodsController, type: :controller do
   stub_authorization!
 
   # Regression test for https://github.com/spree/spree/issues/1240
   it "should not hard-delete shipping methods" do
     shipping_method = stub_model(Spree::ShippingMethod)
-    allow(Spree::ShippingMethod).to receive_messages :find => shipping_method
+    allow(Spree::ShippingMethod).to receive_messages find: shipping_method
     expect(shipping_method.deleted_at).to be_nil
-    spree_delete :destroy, :id => 1
+    spree_delete :destroy, id: 1
     expect(shipping_method.reload.deleted_at).not_to be_nil
   end
 end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe StockItemsController, :type => :controller do
+    describe StockItemsController, type: :controller do
       stub_authorization!
 
       describe "#create" do

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

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe StockLocationsController, :type => :controller do
+    describe StockLocationsController, type: :controller do
       stub_authorization!
-      
+
       # Regression for https://github.com/spree/spree/issues/4272
       context "with no countries present" do
         it "cannot create a new stock location" do
@@ -14,10 +14,11 @@ module Spree
         end
       end
 
-      context "with a default country present" do
+      context "with a default country other than the US present" do
+        let(:country) { create :country, iso: "BR" }
+
         before do
-          country = FactoryGirl.create(:country)
-          Spree::Config[:default_country_id] = country.id
+          Spree::Config[:default_country_iso] = country.iso
         end
 
         it "can create a new stock location" do
@@ -34,8 +35,8 @@ module Spree
         it "can create a new stock location" do
           spree_get :new
           expect(response).to be_success
-        end 
+        end
       end
     end
   end
-end
+end

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

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
 module Spree
-  describe Admin::StockTransfersController, :type => :controller do
+  describe Admin::StockTransfersController, type: :controller do
     stub_authorization!
 
-    let(:warehouse) { StockLocation.create(name: "Warehouse")}
-    let(:ny_store) { StockLocation.create(name: "NY Store")}
-    let(:la_store) { StockLocation.create(name: "LA Store")}
+    let(:warehouse) { StockLocation.create(name: "Warehouse") }
+    let(:ny_store) { StockLocation.create(name: "NY Store") }
+    let(:la_store) { StockLocation.create(name: "LA Store") }
 
     context "#index" do
-
       let!(:stock_transfer1) {
         StockTransfer.create do |transfer|
           transfer.source_location_id = warehouse.id
           transfer.destination_location_id = ny_store.id
-        end }
+        end
+      }
 
       let!(:stock_transfer2) {
         StockTransfer.create do |transfer|
@@ -22,12 +22,13 @@ module Spree
           transfer.destination_location_id = la_store.id
           transfer.finalized_at = DateTime.current
           transfer.closed_at = DateTime.current
-        end }
+        end
+      }
 
       describe "stock location filtering" do
         let(:user) { create(:admin_user) }
         let(:ability) { Spree::Ability.new(user) }
-        let!(:sf_store) { StockLocation.create(name: "SF Store")}
+        let!(:sf_store) { StockLocation.create(name: "SF Store") }
 
         before do
           ability.cannot :manage, Spree::StockLocation
@@ -45,24 +46,24 @@ module Spree
       end
 
       it "searches by stock location" do
-        spree_get :index, :q => { :source_location_id_or_destination_location_id_eq => ny_store.id }
+        spree_get :index, q: { source_location_id_or_destination_location_id_eq: ny_store.id }
         expect(assigns(:stock_transfers).count).to eq 1
         expect(assigns(:stock_transfers)).to include(stock_transfer1)
       end
 
       it "filters the closed stock transfers" do
-        spree_get :index, :q => { :closed_at_null => '1' }
+        spree_get :index, q: { closed_at_null: '1' }
         expect(assigns(:stock_transfers)).to match_array [stock_transfer1]
       end
 
       it "doesn't filter any stock transfers" do
-        spree_get :index, :q => { :closed_at_null => '0' }
+        spree_get :index, q: { closed_at_null: '0' }
         expect(assigns(:stock_transfers)).to match_array [stock_transfer1, stock_transfer2]
       end
     end
 
     context "#create" do
-      let(:warehouse) { StockLocation.create(name: "Warehouse", active: false)}
+      let(:warehouse) { StockLocation.create(name: "Warehouse", active: false) }
 
       subject do
         spree_post :create, stock_transfer: { source_location_id: warehouse.id, description: nil }
@@ -96,18 +97,6 @@ module Spree
           expect(assigns(:stock_transfer).created_by).to eq(user)
         end
       end
-
-      # Regression spec for Solidus issue #1087
-      context "missing source_stock_location parameter" do
-        subject do
-          spree_post :create, stock_transfer: { source_location_id: nil, description: nil }
-        end
-
-        it "sets a flash error" do
-          subject
-          expect(flash[:error]).to eq assigns(:stock_transfer).errors.full_messages.join(', ')
-        end
-      end
     end
 
     context "#receive" do
@@ -328,7 +317,6 @@ module Spree
       end
 
       context "with transferable items" do
-
         it "marks the transfer shipped" do
           subject
 

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

@@ -38,7 +38,6 @@ describe Spree::Admin::StoreCreditsController do
   end
 
   describe "#create" do
-
     subject { spree_post :create, parameters }
 
     before  {
@@ -93,7 +92,7 @@ describe Spree::Admin::StoreCreditsController do
   end
 
   describe "#edit_amount" do
-    let!(:store_credit)      { create(:store_credit, user: user, category: a_credit_category) }
+    let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
 
     before { spree_get :edit_amount, user_id: user.id, id: store_credit.id }
 
@@ -105,7 +104,7 @@ describe Spree::Admin::StoreCreditsController do
   end
 
   describe "#edit_validity" do
-    let!(:store_credit)      { create(:store_credit, user: user, category: a_credit_category) }
+    let!(:store_credit) { create(:store_credit, user: user, category: a_credit_category) }
 
     before { spree_get :edit_validity, user_id: user.id, id: store_credit.id }
 
@@ -276,7 +275,7 @@ describe Spree::Admin::StoreCreditsController do
     subject { spree_put :invalidate, parameters }
 
     it "attempts to invalidate the store credit" do
-      expect { subject  }.to change { store_credit.reload.invalidated_at }.from(nil)
+      expect { subject }.to change { store_credit.reload.invalidated_at }.from(nil)
     end
 
     context "the invalidation is unsuccessful" do

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

@@ -1,12 +1,12 @@
 require 'spec_helper'
 require 'spree/testing_support/bar_ability'
 
-describe Spree::Admin::UsersController, :type => :controller do
+describe Spree::Admin::UsersController, type: :controller do
   let(:user) { create(:user) }
   let(:mock_user) { mock_model Spree.user_class }
 
   before do
-    allow(controller).to receive_messages :spree_current_user => user
+    allow(controller).to receive_messages spree_current_user: user
     user.spree_roles.clear
   end
 
@@ -59,7 +59,7 @@ describe Spree::Admin::UsersController, :type => :controller do
     end
 
     it 'deny access to users without an admin role' do
-      allow(user).to receive_messages :has_spree_role? => false
+      allow(user).to receive_messages has_spree_role?: false
       spree_post :index
       expect(response).to redirect_to '/unauthorized'
     end
@@ -82,7 +82,7 @@ describe Spree::Admin::UsersController, :type => :controller do
 
       it "can clear roles" do
         expect(mock_user).to receive(:spree_roles=).with([])
-        spree_post :create, { id: mock_user.id, user: { first_name: "Bob"}  }
+        spree_post :create, { id: mock_user.id, user: { first_name: "Bob" } }
       end
     end
 
@@ -103,22 +103,22 @@ describe Spree::Admin::UsersController, :type => :controller do
 
       it "cannot clear roles" do
         expect(mock_user).to_not receive(:spree_roles=)
-        spree_post :create, { id: mock_user.id, user: { first_name: "Bob"}  }
+        spree_post :create, { id: mock_user.id, user: { first_name: "Bob" } }
       end
     end
 
     it "can create a shipping_address" do
       expect(Spree.user_class).to receive(:new).with(hash_including(
-        "ship_address_attributes" => { "city" => "New York" }
+                                                       "ship_address_attributes" => { "city" => "New York" }
       ))
-      spree_post :create, { :user => { :ship_address_attributes => { :city => "New York" } } }
+      spree_post :create, { user: { ship_address_attributes: { city: "New York" } } }
     end
 
     it "can create a billing_address" do
       expect(Spree.user_class).to receive(:new).with(hash_including(
-        "bill_address_attributes" => { "city" => "New York" }
+                                                       "bill_address_attributes" => { "city" => "New York" }
       ))
-      spree_post :create, { :user => { :bill_address_attributes => { :city => "New York" } } }
+      spree_post :create, { user: { bill_address_attributes: { city: "New York" } } }
     end
 
     it "can set stock locations" do
@@ -149,7 +149,7 @@ describe Spree::Admin::UsersController, :type => :controller do
 
       it "can clear roles" do
         expect(mock_user).to receive(:spree_roles=).with([])
-        spree_put :update, { id: mock_user.id, user: { first_name: "Bob" }  }
+        spree_put :update, { id: mock_user.id, user: { first_name: "Bob" } }
       end
 
       it "can change email of a user with no roles" do
@@ -171,7 +171,7 @@ describe Spree::Admin::UsersController, :type => :controller do
 
     it "cannot clear roles" do
       expect(mock_user).to_not receive(:spree_roles=)
-      spree_put :update, { id: mock_user.id, user: { first_name: "Bob" }  }
+      spree_put :update, { id: mock_user.id, user: { first_name: "Bob" } }
     end
 
     it "can change email of a user with no roles" do
@@ -187,16 +187,16 @@ describe Spree::Admin::UsersController, :type => :controller do
 
     it "allows shipping address attributes through" do
       expect(mock_user).to receive(:update_attributes).with(hash_including(
-        "ship_address_attributes" => { "city" => "New York" }
+                                                              "ship_address_attributes" => { "city" => "New York" }
       ))
-      spree_put :update, { :id => mock_user.id, :user => { :ship_address_attributes => { :city => "New York" } } }
+      spree_put :update, { id: mock_user.id, user: { ship_address_attributes: { city: "New York" } } }
     end
 
     it "allows billing address attributes through" do
       expect(mock_user).to receive(:update_attributes).with(hash_including(
-        "bill_address_attributes" => { "city" => "New York" }
+                                                              "bill_address_attributes" => { "city" => "New York" }
       ))
-      spree_put :update, { :id => mock_user.id, :user => { :bill_address_attributes => { :city => "New York" } } }
+      spree_put :update, { id: mock_user.id, user: { bill_address_attributes: { city: "New York" } } }
     end
 
     it "can set stock locations" do
@@ -215,13 +215,13 @@ describe Spree::Admin::UsersController, :type => :controller do
     end
 
     it "assigns a list of the users orders" do
-      spree_get :orders, { :id => user.id }
+      spree_get :orders, { id: user.id }
       expect(assigns[:orders].count).to eq 1
       expect(assigns[:orders].first).to eq order
     end
 
     it "assigns a ransack search for Spree::Order" do
-      spree_get :orders, { :id => user.id }
+      spree_get :orders, { id: user.id }
       expect(assigns[:search]).to be_a Ransack::Search
       expect(assigns[:search].klass).to eq Spree::Order
     end
@@ -235,13 +235,13 @@ describe Spree::Admin::UsersController, :type => :controller do
     end
 
     it "assigns a list of the users orders" do
-      spree_get :items, { :id => user.id }
+      spree_get :items, { id: user.id }
       expect(assigns[:orders].count).to eq 1
       expect(assigns[:orders].first).to eq order
     end
 
     it "assigns a ransack search for Spree::Order" do
-      spree_get :items, { :id => user.id }
+      spree_get :items, { id: user.id }
       expect(assigns[:search]).to be_a Ransack::Search
       expect(assigns[:search].klass).to eq Spree::Order
     end

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

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module Spree
   module Admin
-    describe VariantsController, :type => :controller do
+    describe VariantsController, type: :controller do
       stub_authorization!
 
       describe "#index" do
@@ -10,19 +10,20 @@ module Spree
         let!(:variant_1) { create(:variant, product: product) }
         let!(:variant_2) { create(:variant, product: product) }
 
+        before { variant_2.destroy }
+
         context "deleted is not requested" do
-          it "assigns the variants for a requested product" do
+          it "does not assign deleted variants for a requested product" do
             spree_get :index, product_id: product.slug
             expect(assigns(:collection)).to include variant_1
-            expect(assigns(:collection)).to include variant_2
+            expect(assigns(:collection)).not_to include variant_2
           end
         end
 
         context "deleted is requested" do
-          before { variant_2.destroy }
-          it "assigns only deleted variants for a requested product" do
+          it "assigns deleted along with non-deleted variants for a requested product" do
             spree_get :index, product_id: product.slug, deleted: "on"
-            expect(assigns(:collection)).not_to include variant_1
+            expect(assigns(:collection)).to include variant_1
             expect(assigns(:collection)).to include variant_2
           end
         end

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

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Analytics Tracker", :type => :feature do
+describe "Analytics Tracker", type: :feature do
   stub_authorization!
 
   context "index" do
@@ -26,7 +26,7 @@ describe "Analytics Tracker", :type => :feature do
         expect(column_text(2)).to eq("Yes")
       end
     end
-   end
+  end
 
   context "create" do
     before(:each) do
@@ -37,7 +37,7 @@ describe "Analytics Tracker", :type => :feature do
 
     it "should be able to create a new analytics tracker" do
       click_link "admin_new_tracker_link"
-      fill_in "tracker_analytics_id", :with => "A100"
+      fill_in "tracker_analytics_id", with: "A100"
       click_button "Create"
 
       expect(page).to have_content("successfully created!")

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

@@ -9,7 +9,7 @@ module Spree
       click_link "New Country"
 
       fill_in "Name", with: "Brazil"
-      fill_in "Iso Name", with: "BRL"
+      fill_in "ISO Name", with: "BRL"
       click_button "Create"
 
       accept_alert do

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

@@ -14,7 +14,7 @@ describe "General Settings", type: :feature, js: true do
     click_link "General Settings"
   end
 
-  context "visiting general settings (admin)" do
+  context "visiting general settings" do
     it "should have the right content" do
       expect(page).to have_content("General Settings")
       expect(page).to have_field("store_name", with: "Test Store")
@@ -23,7 +23,7 @@ describe "General Settings", type: :feature, js: true do
     end
   end
 
-  context "editing general settings (admin)" do
+  context "editing general settings" do
     it "should be able to update the site name" do
       fill_in "store_name", with: "Spree Demo Site99"
       fill_in "store_mail_from_address", with: "spree@example.org"
@@ -35,6 +35,16 @@ describe "General Settings", type: :feature, js: true do
     end
   end
 
+  context "update fails" do
+    it "should display the error" do
+      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: "")
+    end
+  end
+
   context "clearing the cache" do
     it "should clear the cache" do
       expect(page).to_not have_content(Spree.t(:clear_cache_ok))

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

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe "Payment Methods", :type => :feature do
+describe "Payment Methods", type: :feature do
   stub_authorization!
 
   before(:each) do
     visit spree.admin_path
     click_link "Settings"
+    click_link "Payments"
   end
 
   context "admin visiting payment methods listing page" do
@@ -14,10 +15,10 @@ describe "Payment Methods", :type => :feature do
       click_link "Payment Methods"
 
       within("table#listing_payment_methods") do
-        expect(all("th")[0].text).to eq("Name")
-        expect(all("th")[1].text).to eq("Provider")
-        expect(all("th")[2].text).to eq("Display")
-        expect(all("th")[3].text).to eq("Active")
+        expect(all("th")[1].text).to eq("Name")
+        expect(all("th")[2].text).to eq("Provider")
+        expect(all("th")[3].text).to eq("Display")
+        expect(all("th")[4].text).to eq("Active")
       end
 
       within('table#listing_payment_methods') do
@@ -31,9 +32,9 @@ describe "Payment Methods", :type => :feature do
       click_link "Payment Methods"
       click_link "admin_new_payment_methods_link"
       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"
+      fill_in "payment_method_name", with: "check90"
+      fill_in "payment_method_description", with: "check90 desc"
+      select "PaymentMethod::Check", from: "gtwy-type"
       click_button "Create"
       expect(page).to have_content("successfully created!")
     end
@@ -49,14 +50,14 @@ describe "Payment Methods", :type => :feature do
     end
 
     it "should be able to edit an existing payment method" do
-      fill_in "payment_method_name", :with => "Payment 99"
+      fill_in "payment_method_check_name", with: "Payment 99"
       click_button "Update"
       expect(page).to have_content("successfully updated!")
-      expect(page).to have_field("payment_method_name", with: "Payment 99")
+      expect(page).to have_field("payment_method_check_name", with: "Payment 99")
     end
 
     it "should display validation errors" do
-      fill_in "payment_method_name", :with => ""
+      fill_in "payment_method_check_name", with: ""
       click_button "Update"
       expect(page).to have_content("Name can't be blank")
     end
@@ -103,7 +104,7 @@ describe "Payment Methods", :type => :feature do
     end
 
     it "updates successfully and keeps secrets" do
-      Spree::Config.static_model_preferences.add(Spree::Gateway::Bogus, 'my_prefs', {server: 'secret'})
+      Spree::Config.static_model_preferences.add(Spree::Gateway::Bogus, 'my_prefs', { server: 'secret' })
 
       create(:credit_card_payment_method)
       click_link "Payment Methods"