solidus_api 2.4.2 → 2.5.0.beta1

data/spec/requests/spree/api/orders_controller_spec.rb

@@ -45,20 +45,20 @@ module Spree
 
         it "does not include unpermitted params, or allow overriding the user" do
           subject
-          expect(response).to be_success
+          expect(response).to be_successful
           order = Spree::Order.last
           expect(order.user).to eq current_api_user
           expect(order.email).to eq target_user.email
         end
 
-        it { is_expected.to be_success }
+        it { is_expected.to be_successful }
 
         context 'creating payment' do
           let(:attributes) { super().merge(payments_attributes: [{ payment_method_id: payment_method.id }]) }
 
           context "with allowed payment method" do
             let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
+            it { is_expected.to be_successful }
             it "creates a payment" do
               expect {
                 subject
@@ -91,7 +91,7 @@ module Spree
           expect(order.created_at).to eq date_override
         end
 
-        it { is_expected.to be_success }
+        it { is_expected.to be_successful }
       end
 
       context 'when the line items have custom attributes' do
@@ -126,7 +126,7 @@ module Spree
           }.to change { order.reload.email }.to("foo@foobar.com")
         end
 
-        it { is_expected.to be_success }
+        it { is_expected.to be_successful }
 
         it "does not associate users" do
           expect {
@@ -145,7 +145,7 @@ module Spree
 
           context "with allowed payment method" do
             let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
+            it { is_expected.to be_successful }
             it "creates a payment" do
               expect {
                 subject
@@ -269,7 +269,7 @@ module Spree
 
     describe 'GET #show' do
       let(:order) { create :order_with_line_items }
-      let(:adjustment) { FactoryGirl.create(:adjustment, adjustable: order, order: order) }
+      let(:adjustment) { FactoryBot.create(:adjustment, adjustable: order, order: order) }
 
       subject { get spree.api_order_path(order) }
 
@@ -289,6 +289,22 @@ module Spree
         end
       end
 
+      context 'when an item does not track inventory' do
+        before do
+          order.line_items.first.variant.update_attributes!(track_inventory: false)
+        end
+
+        it 'contains stock information on variant' do
+          subject
+          variant = json_response['line_items'][0]['variant']
+          expect(variant).to_not be_nil
+          expect(variant['in_stock']).to eq(true)
+          expect(variant['total_on_hand']).to eq(nil)
+          expect(variant['is_backorderable']).to eq(true)
+          expect(variant['is_destroyed']).to eq(false)
+        end
+      end
+
       context 'when shipment adjustments are present' do
         before do
           order.shipments.first.adjustments << adjustment
@@ -541,7 +557,7 @@ module Spree
       context "order has shipments" do
         before { order.create_proposed_shipments }
 
-        it "clears out all existing shipments on line item udpate" do
+        it "clears out all existing shipments on line item update" do
           put spree.api_order_path(order), params: { order: {
             line_items: {
               0 => { id: line_item.id, quantity: 10 }
@@ -616,7 +632,7 @@ module Spree
 
         context "when in delivery" do
           let!(:shipping_method) do
-            FactoryGirl.create(:shipping_method).tap do |shipping_method|
+            FactoryBot.create(:shipping_method).tap do |shipping_method|
               shipping_method.calculator.preferred_amount = 10
               shipping_method.calculator.save
             end
@@ -825,7 +841,7 @@ module Spree
           expect(response.status).to eq 200
           expect(order.reload.promotions).to eq [promo]
           expect(json_response).to eq({
-            "success" => Spree.t(:coupon_code_applied),
+            "success" => I18n.t('spree.coupon_code_applied'),
             "error" => nil,
             "successful" => true,
             "status_code" => "coupon_code_applied"
@@ -843,7 +859,7 @@ module Spree
           expect(order.reload.promotions).to eq []
           expect(json_response).to eq({
             "success" => nil,
-            "error" => Spree.t(:coupon_code_unknown_error),
+            "error" => I18n.t('spree.coupon_code_unknown_error'),
             "successful" => false,
             "status_code" => "coupon_code_unknown_error"
           })

data/spec/requests/spree/api/products_controller_spec.rb

@@ -178,7 +178,7 @@ module Spree
         specify do
           get spree.api_product_path(product)
           expect(json_response["slug"]).to match(/and-1-ways/)
-          product.destroy
+          product.discard
 
           get spree.api_product_path(other_product)
           expect(json_response["slug"]).to match(/droids/)

data/spec/requests/spree/api/return_authorizations_controller_spec.rb

@@ -14,8 +14,8 @@ module Spree
 
     shared_examples_for 'a return authorization creator' do
       it "can create a new return authorization" do
-        stock_location = FactoryGirl.create(:stock_location)
-        reason = FactoryGirl.create(:return_reason)
+        stock_location = FactoryBot.create(:stock_location)
+        reason = FactoryBot.create(:return_reason)
         rma_params = { stock_location_id: stock_location.id,
                        return_reason_id: reason.id,
                        memo: "Defective" }
@@ -74,7 +74,7 @@ module Spree
       sign_in_as_admin!
 
       it "can show return authorization" do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         get spree.api_order_return_authorization_path(order, return_authorization.id)
         expect(response.status).to eq(200)
@@ -83,8 +83,8 @@ module Spree
       end
 
       it "can get a list of return authorizations" do
-        FactoryGirl.create(:return_authorization, order: order)
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         get spree.api_order_return_authorizations_path(order), params: { order_id: order.number }
         expect(response.status).to eq(200)
         return_authorizations = json_response["return_authorizations"]
@@ -93,8 +93,8 @@ module Spree
       end
 
       it 'can control the page size through a parameter' do
-        FactoryGirl.create(:return_authorization, order: order)
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         get spree.api_order_return_authorizations_path(order), params: { order_id: order.number, per_page: 1 }
         expect(json_response['count']).to eq(1)
         expect(json_response['current_page']).to eq(1)
@@ -102,7 +102,7 @@ module Spree
       end
 
       it 'can query the results through a paramter' do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         expected_result = create(:return_authorization, memo: 'damaged')
         order.return_authorizations << expected_result
         get spree.api_order_return_authorizations_path(order), params: { q: { memo_cont: 'damaged' } }
@@ -118,7 +118,7 @@ module Spree
       end
 
       it "can update a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         put spree.api_order_return_authorization_path(order, return_authorization.id), params: { return_authorization: { memo: "ABC" } }
         expect(response.status).to eq(200)
@@ -126,7 +126,7 @@ module Spree
       end
 
       it "can cancel a return authorization on the order" do
-        FactoryGirl.create(:new_return_authorization, order: order)
+        FactoryBot.create(:new_return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         expect(return_authorization.state).to eq("authorized")
         put spree.cancel_api_order_return_authorization_path(order, return_authorization.id)
@@ -135,7 +135,7 @@ module Spree
       end
 
       it "can delete a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         delete spree.api_order_return_authorization_path(order, return_authorization.id)
         expect(response.status).to eq(204)
@@ -152,7 +152,7 @@ module Spree
       end
 
       it "cannot update a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         put spree.api_order_return_authorization_path(order, return_authorization.id), params: { return_authorization: { memo: "ABC" } }
         assert_unauthorized!
@@ -160,7 +160,7 @@ module Spree
       end
 
       it "cannot delete a return authorization on the order" do
-        FactoryGirl.create(:return_authorization, order: order)
+        FactoryBot.create(:return_authorization, order: order)
         return_authorization = order.return_authorizations.first
         delete spree.api_order_return_authorization_path(order, return_authorization.id)
         assert_unauthorized!

data/spec/requests/spree/api/shipments_controller_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Spree::Api::ShipmentsController, type: :request do
+  include ActiveSupport::Testing::TimeHelpers
+
   let!(:shipment) { create(:shipment, inventory_units: [build(:inventory_unit, shipment: nil)]) }
   let!(:attributes) { [:id, :tracking, :tracking_url, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_methods] }
 
@@ -126,7 +128,7 @@ describe Spree::Api::ShipmentsController, type: :request do
 
       it 'removes a destroyed variant from a shipment' do
         order.contents.add(variant, 2)
-        variant.destroy
+        variant.discard
 
         put spree.remove_api_shipment_path(shipment), params: { variant_id: variant.to_param, quantity: 1 }
         expect(response.status).to eq(200)
@@ -134,6 +136,23 @@ describe Spree::Api::ShipmentsController, type: :request do
       end
     end
 
+    context 'for ready shipments' do
+      let(:order) { create :order_ready_to_ship, line_items_attributes: [{ variant: variant, quantity: 1 }] }
+      let(:shipment) { order.shipments.first }
+
+      it 'adds a variant to a shipment' do
+        put spree.add_api_shipment_path(shipment), params: { variant_id: variant.to_param, quantity: 1 }
+        expect(response.status).to eq(200)
+        expect(json_response['manifest'].detect { |h| h['variant']['id'] == variant.id }['quantity']).to eq(2)
+      end
+
+      it 'removes a variant from a shipment' do
+        put spree.remove_api_shipment_path(shipment), params: { variant_id: variant.to_param, quantity: 1 }
+        expect(response.status).to eq(200)
+        expect(json_response['manifest'].detect { |h| h['variant']['id'] == variant.id }).to be nil
+      end
+    end
+
     context "for shipped shipments" do
       let(:order) { create :shipped_order }
       let(:shipment) { order.shipments.first }
@@ -218,6 +237,48 @@ describe Spree::Api::ShipmentsController, type: :request do
     end
   end
 
+  describe "#estimated_rates" do
+    let!(:user_shipping_method) { shipment.shipping_method }
+    let!(:admin_shipping_method) { create(:shipping_method, available_to_users: false, name: "Secret") }
+
+    sign_in_as_admin!
+
+    subject do
+      get spree.estimated_rates_api_shipment_path(shipment)
+    end
+
+    it "returns success" do
+      subject
+      expect(response).to be_success
+    end
+
+    it "returns rates available to user" do
+      subject
+      expect(json_response['shipping_rates']).to include(
+        {
+          "name" => user_shipping_method.name,
+          "cost" => "100.0",
+          "shipping_method_id" => user_shipping_method.id,
+          "shipping_method_code" => user_shipping_method.code,
+          "display_cost" => "$100.00"
+        }
+      )
+    end
+
+    it "returns rates available to admin" do
+      subject
+      expect(json_response['shipping_rates']).to include(
+        {
+          "name" => admin_shipping_method.name,
+          "cost" => "10.0",
+          "shipping_method_id" => admin_shipping_method.id,
+          "shipping_method_code" => admin_shipping_method.code,
+          "display_cost" => "$10.00"
+        }
+      )
+    end
+  end
+
   describe "#ship" do
     let(:shipment) { create(:order_ready_to_ship).shipments.first }
 
@@ -230,11 +291,12 @@ describe Spree::Api::ShipmentsController, type: :request do
     context "the user is allowed to ship the shipment" do
       sign_in_as_admin!
       it "ships the shipment" do
-        Timecop.freeze do
+        now = Time.current
+        travel_to(now) do
           subject
           shipment.reload
           expect(shipment.state).to eq 'shipped'
-          expect(shipment.shipped_at.to_i).to eq Time.current.to_i
+          expect(shipment.shipped_at.to_i).to eq now.to_i
         end
       end
 
@@ -348,7 +410,7 @@ describe Spree::Api::ShipmentsController, type: :request do
 
         it "returns the correct message" do
           subject
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(parsed_response["success"]).to be true
           expect(parsed_response["message"]).to eq("Variants successfully transferred")
         end

data/spec/requests/spree/api/stock_items_controller_spec.rb

@@ -18,7 +18,7 @@ module Spree
       describe "#index" do
         it "can list stock items for an active stock location" do
           get spree.api_stock_location_stock_items_path(stock_location)
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(json_response['stock_items'].first).to have_attributes(attributes)
           expect(json_response['stock_items'].first['variant']['sku']).to match /\ASKU-\d+\z/
         end
@@ -169,7 +169,7 @@ module Spree
           it "does not allow negative inventory for the stock item" do
             subject
             expect(response.status).to eq 422
-            expect(response.body).to match Spree.t(:stock_not_below_zero)
+            expect(response.body).to match I18n.t('spree.stock_not_below_zero')
             expect(assigns(:stock_item).count_on_hand).to eq 0
           end
         end
@@ -235,7 +235,7 @@ module Spree
             it "does not allow negative inventory for the stock item" do
               subject
               expect(response.status).to eq 422
-              expect(response.body).to match Spree.t(:stock_not_below_zero)
+              expect(response.body).to match I18n.t('spree.stock_not_below_zero')
               expect(assigns(:stock_item).count_on_hand).to eq 10
             end
           end
@@ -293,7 +293,7 @@ module Spree
             it "does not allow negative inventory for the stock item" do
               subject
               expect(response.status).to eq 422
-              expect(response.body).to match Spree.t(:stock_not_below_zero)
+              expect(response.body).to match I18n.t('spree.stock_not_below_zero')
               expect(assigns(:stock_item).count_on_hand).to eq 10
             end
           end

data/spec/requests/spree/api/stock_locations_controller_spec.rb

@@ -14,7 +14,7 @@ module Spree
       describe "#index" do
         it "can see active stock locations" do
           get spree.api_stock_locations_path
-          expect(response).to be_success
+          expect(response).to be_successful
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
         end
@@ -22,7 +22,7 @@ module Spree
         it "cannot see inactive stock locations" do
           stock_location.update_attributes!(active: false)
           get spree.api_stock_locations_path
-          expect(response).to be_success
+          expect(response).to be_successful
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).not_to include stock_location.name
         end
@@ -31,7 +31,7 @@ module Spree
       describe "#show" do
         it "can see active stock locations" do
           get spree.api_stock_location_path(stock_location)
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(json_response['name']).to eq stock_location.name
         end
 
@@ -77,7 +77,7 @@ module Spree
       describe "#index" do
         it "can see active stock locations" do
           get spree.api_stock_locations_path
-          expect(response).to be_success
+          expect(response).to be_successful
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
         end
@@ -85,7 +85,7 @@ module Spree
         it "can see inactive stock locations" do
           stock_location.update_attributes!(active: false)
           get spree.api_stock_locations_path
-          expect(response).to be_success
+          expect(response).to be_successful
           stock_locations = json_response['stock_locations'].map { |sl| sl['name'] }
           expect(stock_locations).to include stock_location.name
         end
@@ -116,14 +116,14 @@ module Spree
       describe "#show" do
         it "can see active stock locations" do
           get spree.api_stock_location_path(stock_location)
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(json_response['name']).to eq stock_location.name
         end
 
         it "can see inactive stock locations" do
           stock_location.update_attributes!(active: false)
           get spree.api_stock_location_path(stock_location)
-          expect(response).to be_success
+          expect(response).to be_successful
           expect(json_response['name']).to eq stock_location.name
         end
       end

data/spec/requests/spree/api/taxonomies_controller_spec.rb

@@ -59,6 +59,7 @@ module Spree
       end
 
       it "gets the jstree-friendly version of a taxonomy" do
+        expect(Spree::Deprecation).to(receive(:warn))
         get spree.jstree_api_taxonomy_path(taxonomy.id)
         expect(json_response["data"]).to eq(taxonomy.root.name)
         expect(json_response["attr"]).to eq({ "id" => taxonomy.root.id, "name" => taxonomy.root.name })

data/spec/requests/spree/api/taxons_controller_spec.rb

@@ -92,6 +92,7 @@ module Spree
       end
 
       it "gets all taxons in JSTree form" do
+        expect(Spree::Deprecation).to(receive(:warn))
         get spree.jstree_api_taxonomy_taxon_path(taxonomy, taxon.id)
         response = json_response.first
         expect(response["data"]).to eq(taxon2.name)
@@ -130,11 +131,11 @@ module Spree
 
         it "handles exclude_data correctly" do
           get spree.api_taxon_products_path, params: { id: taxon.id, simple: true }
-          expect(response).to be_success
+          expect(response).to be_successful
           simple_response = json_response
 
           get spree.api_taxon_products_path, params: { id: taxon.id }
-          expect(response).to be_success
+          expect(response).to be_successful
           full_response = json_response
 
           expect(simple_response["products"][0]["description"]).to be_nil

data/spec/requests/spree/api/variants_controller_spec.rb

@@ -114,6 +114,32 @@ module Spree
           end
         end
 
+        context "only suplliable variants" do
+          subject { get spree.api_variants_path, params: { suppliable_only: "true" } }
+
+          context "variant is backorderable" do
+            before do
+              variant.stock_items.update_all(count_on_hand: 0, backorderable: true)
+            end
+
+            it "is not returned in the results" do
+              subject
+              expect(json_response["variants"].count).to eq 1
+            end
+          end
+
+          context "variant is unsuppliable" do
+            before do
+              variant.stock_items.update_all(count_on_hand: 0, backorderable: false)
+            end
+
+            it "is returned in the results" do
+              subject
+              expect(json_response["variants"].count).to eq 0
+            end
+          end
+        end
+
         context "all variants" do
           subject { get spree.api_variants_path, params: { in_stock_only: "false" } }
 

data/spec/spec_helper.rb

@@ -1,28 +1,24 @@
 if ENV["COVERAGE"]
-  # Run Coverage report
   require 'simplecov'
-  SimpleCov.start do
-    add_group 'Controllers', 'app/controllers'
-    add_group 'Helpers', 'app/helpers'
-    add_group 'Mailers', 'app/mailers'
-    add_group 'Models', 'app/models'
-    add_group 'Views', 'app/views'
-    add_group 'Libraries', 'lib'
-  end
+  SimpleCov.start('rails')
 end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
 
-begin
-  require File.expand_path("../dummy/config/environment", __FILE__)
-rescue LoadError
-  $stderr.puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
-  exit 1
-end
+require 'solidus_api'
+require 'spree/testing_support/dummy_app'
+DummyApp.setup(
+  gem_root: File.expand_path('../../', __FILE__),
+  lib_name: 'solidus_api'
+)
 
+require 'rails-controller-testing'
 require 'rspec/rails'
-require 'ffaker'
+require 'rspec-activemodel-mocks'
+
+require 'database_cleaner'
+require 'with_model'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -49,7 +45,7 @@ RSpec.configure do |config|
     c.syntax = :expect
   end
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, type: :request
   config.extend Spree::Api::TestingSupport::Setup, type: :request
   config.include Spree::Api::TestingSupport::Helpers, type: :controller
@@ -58,8 +54,6 @@ RSpec.configure do |config|
 
   config.extend WithModel
 
-  config.fail_fast = ENV['FAIL_FAST'] || false
-
   config.before(:each) do
     Rails.cache.clear
     reset_spree_preferences
@@ -67,10 +61,6 @@ RSpec.configure do |config|
   end
 
   config.include ActiveJob::TestHelper
-  config.include VersionCake::TestHelpers, type: :controller
-  config.before(:each, type: :controller) do
-    set_request_version('', 1)
-  end
 
   config.use_transactional_fixtures = true