solidus_api 1.0.0.pre3 → 1.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc84533efe45262ccaba47a9b25f28945ee08dcc
-  data.tar.gz: ce8a1e2811b9e94a69f0f91b9d381add04438543
+  metadata.gz: b7c271766717aaef1ae950109c06fecb37cdec93
+  data.tar.gz: ce730cc176f7a37b64198be1964a56e6a04c78b0
 SHA512:
-  metadata.gz: 4249505d8a2bcbaa5e14d799ca5d6b2d273e97c17e336eaa7c1d36ea0de088565d7508499405633b713b394f90573ad0996b00fb3ff0a9e730f6cbc6a75761cf
-  data.tar.gz: 4dfbe553d6a0fea7ef9434159fab80dfb0f689e56d49fec6f5da67890e3d229b15ebb66519d84ca0056c86cd3991a06729917ce65cbc682a5bc1d665b2f2e3b6
+  metadata.gz: f236ad20fa754fb22a647fb63f61e61b71875f42677dfb4193ae288026e5582c4edf861171366750feae74b19d0d93c5b639beb51a4c16f8ecc7f081e092aada
+  data.tar.gz: 8f72358eb2effe84b6110cdd583fcb14779b14396948aed11af21a245d40030f678720f4632174a75a0d80640430815cef462c850225ceee6ed5d812773edca6

data/app/controllers/spree/api/checkouts_controller.rb

@@ -86,7 +86,6 @@ module Spree
 
         def load_order
           @order = Spree::Order.find_by!(number: params[:id])
-          raise_insufficient_quantity and return if @order.insufficient_stock_lines.present?
         end
 
         def update_order_state
@@ -94,10 +93,6 @@ module Spree
           state_callback(:before)
         end
 
-        def raise_insufficient_quantity
-          respond_with(@order, default_template: 'spree/api/orders/insufficient_quantity')
-        end
-
         def state_callback(before_or_after = :before)
           method_name = :"#{before_or_after}_#{@order.state}"
           send(method_name) if respond_to?(method_name, true)

data/app/views/spree/api/orders/show.v1.rabl

@@ -1,8 +1,8 @@
 object @order
 extends "spree/api/orders/order"
 
-if lookup_context.find_all("spree/api/orders/#{root_object.state}").present?
-  extends "spree/api/orders/#{root_object.state}"
+child :available_payment_methods => :payment_methods do
+  attributes :id, :name, :environment, :method_type
 end
 
 child :billing_address => :bill_address do

data/spec/controllers/spree/api/base_controller_spec.rb

@@ -135,8 +135,8 @@ describe Spree::Api::BaseController, :type => :controller do
 
   context 'insufficient stock' do
     before do
-      subject.should_receive(:authenticate_user).and_return(true)
-      subject.should_receive(:index).and_raise(Spree::Order::InsufficientStock)
+      expect(subject).to receive(:authenticate_user).and_return(true)
+      expect(subject).to receive(:index).and_raise(Spree::Order::InsufficientStock)
       get :index, :token => "fake_key"
     end
 
@@ -165,7 +165,7 @@ describe Spree::Api::BaseController, :type => :controller do
     context 'without an existing lock' do
       it 'succeeds' do
         api_get :index, order_token: order.guest_token, order_id: order.number
-        response.status.should == 200
+        expect(response.status).to eq(200)
       end
     end
 
@@ -176,7 +176,7 @@ describe Spree::Api::BaseController, :type => :controller do
 
       it 'returns a 409 conflict' do
         api_get :index, order_token: order.guest_token, order_id: order.number
-        response.status.should == 409
+        expect(response.status).to eq(409)
       end
     end
   end

data/spec/controllers/spree/api/checkouts_controller_spec.rb

@@ -155,7 +155,7 @@ module Spree
 
       it "can update payment method and transition from payment to confirm" do
         order.update_column(:state, "payment")
-        Spree::Gateway::Bogus.any_instance.stub(:source_required?).and_return(false)
+        allow_any_instance_of(Spree::Gateway::Bogus).to receive(:source_required?).and_return(false)
         api_put :update, id: order.to_param, order_token: order.guest_token,
           order: { payments_attributes: [{ payment_method_id: @payment_method.id }] }
         expect(json_response['state']).to eq('confirm')
@@ -168,9 +168,9 @@ module Spree
         order.update_column(:state, "payment")
         api_put :update, :id => order.to_param, :order_token => order.guest_token,
           :order => { :payments_attributes => [{ :payment_method_id => @payment_method.id }] }
-        response.status.should == 422
+        expect(response.status).to eq(422)
         source_errors = json_response['errors']['payments.source']
-        source_errors.should include("can't be blank")
+        expect(source_errors).to include("can't be blank")
       end
 
       it "can update payment method with source and transition from payment to confirm" do
@@ -325,16 +325,16 @@ module Spree
           end
 
           it "can transition from confirm to complete" do
-            Spree::Order.any_instance.stub(:payment_required? => false)
+            allow_any_instance_of(Spree::Order).to receive_messages(:payment_required? => false)
             subject
-            json_response['state'].should == 'complete'
-            response.status.should == 200
+            expect(json_response['state']).to eq('complete')
+            expect(response.status).to eq(200)
           end
 
           it "returns a sensible error when no payment method is specified" do
             # api_put :complete, :id => order.to_param, :order_token => order.token, :order => {}
             subject
-            json_response["errors"]["base"].should include(Spree.t(:no_payment_found))
+            expect(json_response["errors"]["base"]).to include(Spree.t(:no_payment_found))
           end
 
           context "with mismatched expected_total" do
@@ -343,8 +343,8 @@ module Spree
             it "returns an error if expected_total is present and does not match actual total" do
               # api_put :complete, :id => order.to_param, :order_token => order.token, :expected_total => order.total + 1
               subject
-              response.status.should == 400
-              json_response['errors']['expected_total'].should include(Spree.t(:expected_total_mismatch, :scope => 'api.order'))
+              expect(response.status).to eq(400)
+              expect(json_response['errors']['expected_total']).to include(Spree.t(:expected_total_mismatch, :scope => 'api.order'))
             end
           end
         end

data/spec/controllers/spree/api/inventory_units_controller_spec.rb

@@ -21,7 +21,7 @@ module Spree
       it "updates an inventory unit" do
         api_put :update, :id => @inventory_unit.id,
                          :inventory_unit => { variant_id: variant.id }
-        json_response['variant_id'].should eq variant.id
+        expect(json_response['variant_id']).to eq variant.id
       end
 
       context 'fires state event' do

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

@@ -52,11 +52,12 @@ module Spree
         it "does not include unpermitted params, or allow overriding the user", focus: true do
           expect(Spree::Core::Importer::Order).to receive(:import).
             once.
-            with(current_api_user, { "email" => target_user.email })
+            with(current_api_user, { "email" => target_user.email }).
+            and_call_original
           subject
         end
 
-        it { should be_success }
+        it { is_expected.to be_success }
       end
 
       context "when the current user can administrate the order" do
@@ -65,11 +66,12 @@ module Spree
         it "it permits all params and allows overriding the user" do
           expect(Spree::Core::Importer::Order).to receive(:import).
             once.
-            with(target_user, { "user_id" => target_user.id, "created_at" => date_override, "email" => target_user.email})
+            with(target_user, { "user_id" => target_user.id, "created_at" => date_override, "email" => target_user.email}).
+            and_call_original
           subject
         end
 
-        it { should be_success }
+        it { is_expected.to be_success }
       end
     end
 
@@ -103,7 +105,7 @@ module Spree
         subject
       end
 
-      it { should be_success }
+      it { is_expected.to be_success }
 
       context "when the user can administer the order" do
         let(:can_admin) { true }
@@ -790,7 +792,7 @@ module Spree
       let(:promo_code) { promo.codes.first }
 
       before do
-        Order.any_instance.stub :user => current_api_user
+        allow_any_instance_of(Order).to receive_messages :user => current_api_user
       end
 
       context 'when successful' do

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

@@ -35,13 +35,13 @@ module Spree
 
         context "payment source is not required" do
           before do
-            Spree::Gateway::Bogus.any_instance.stub(:source_required?).and_return(false)
+            allow_any_instance_of(Spree::Gateway::Bogus).to receive(:source_required?).and_return(false)
           end
 
           it "can create a new payment" do
             api_post :create, :payment => { :payment_method_id => PaymentMethod.first.id, :amount => 50 }
-            response.status.should == 201
-            json_response.should have_attributes(attributes)
+            expect(response.status).to eq(201)
+            expect(json_response).to have_attributes(attributes)
           end
         end
 
@@ -49,17 +49,17 @@ module Spree
           context "no source is provided" do
             it "returns errors" do
               api_post :create, :payment => { :payment_method_id => PaymentMethod.first.id, :amount => 50 }
-              response.status.should == 422
-              json_response['error'].should == "Invalid resource. Please fix errors and try again."
-              json_response['errors']['source'].should == ["can't be blank"]
+              expect(response.status).to eq(422)
+              expect(json_response['error']).to eq("Invalid resource. Please fix errors and try again.")
+              expect(json_response['errors']['source']).to eq(["can't be blank"])
             end
           end
 
           context "source is provided" do
             it "can create a new payment" do
               api_post :create, :payment => { :payment_method_id => PaymentMethod.first.id, :amount => 50, source_attributes: {gateway_payment_profile_id: 1} }
-              response.status.should == 201
-              json_response.should have_attributes(attributes)
+              expect(response.status).to eq(201)
+              expect(json_response).to have_attributes(attributes)
             end
           end
         end

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

@@ -22,9 +22,9 @@ module Spree
                        :return_reason_id => reason.id,
                        :memo => "Defective" }
         api_post :create, :order_id => order.number, :return_authorization => rma_params
-        response.status.should == 201
-        json_response.should have_attributes(attributes)
-        json_response["state"].should_not be_blank
+        expect(response.status).to eq(201)
+        expect(json_response).to have_attributes(attributes)
+        expect(json_response["state"]).not_to be_blank
       end
     end
 
@@ -63,7 +63,7 @@ module Spree
 
     context "as another non-admin user that's not the order's owner" do
       before do
-        Order.any_instance.stub :user => create(:user)
+        allow_any_instance_of(Order).to receive_messages :user => create(:user)
       end
 
       it "cannot create a new return authorization" do

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

@@ -125,13 +125,13 @@ describe Spree::Api::ShipmentsController, :type => :controller do
 
       it 'adds a variant to a shipment' do
         api_put :add, { variant_id: variant.to_param, quantity: 2 }
-        response.status.should == 200
-        json_response['manifest'].detect { |h| h['variant']['id'] == variant.id }["quantity"].should == 2
+        expect(response.status).to eq(200)
+        expect(json_response['manifest'].detect { |h| h['variant']['id'] == variant.id }["quantity"]).to eq(2)
       end
 
       it 'cannot remove a variant from a shipment' do
         api_put :remove, { variant_id: variant.to_param, quantity: 1 }
-        response.status.should == 422
+        expect(response.status).to eq(422)
         expect(json_response['errors']['base'].join).to match /Cannot remove items/
       end
 

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

@@ -18,8 +18,8 @@ module Spree
         it "can list stock items for an active stock location" do
           api_get :index, stock_location_id: stock_location.to_param
           expect(response).to be_success
-          json_response['stock_items'].first.should have_attributes(attributes)
-          json_response['stock_items'].first['variant']['sku'].should match /\ASKU-\d+\z/
+          expect(json_response['stock_items'].first).to have_attributes(attributes)
+          expect(json_response['stock_items'].first['variant']['sku']).to match /\ASKU-\d+\z/
         end
 
         it "cannot list stock items for an inactive stock location" do
@@ -32,14 +32,14 @@ module Spree
       describe "#show" do
         it "can see a stock item for an active stock location" do
           api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
-          json_response.should have_attributes(attributes)
-          json_response['count_on_hand'].should eq stock_item.count_on_hand
+          expect(json_response).to have_attributes(attributes)
+          expect(json_response['count_on_hand']).to eq stock_item.count_on_hand
         end
 
         it "cannot see a stock item for an inactive stock location" do
           stock_location.update_attributes!(active: false)
           api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
-          response.status.should == 404
+          expect(response.status).to eq(404)
         end
       end
 
@@ -55,21 +55,21 @@ module Spree
           }
 
           api_post :create, params
-          response.status.should == 404
+          expect(response.status).to eq(404)
         end
       end
 
       describe "#update" do
         it "cannot update a stock item" do
           api_put :update, stock_location_id: stock_location.to_param, id: stock_item.to_param
-          response.status.should == 404
+          expect(response.status).to eq(404)
         end
       end
 
       describe "#destroy" do
         it "cannot destroy a stock item" do
           api_delete :destroy, stock_location_id: stock_location.to_param, id: stock_item.to_param
-          response.status.should == 404
+          expect(response.status).to eq(404)
         end
       end
     end

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

@@ -53,21 +53,21 @@ module Spree
           }
 
           api_post :create, params
-          response.status.should == 401
+          expect(response.status).to eq(401)
         end
       end
 
       describe "#update" do
         it "cannot update a stock location" do
           api_put :update, :stock_location => { :name => "South Pole" }, :id => stock_location.to_param
-          response.status.should == 401
+          expect(response.status).to eq(401)
         end
       end
 
       describe "#destroy" do
         it "cannot delete a stock location" do
           api_put :destroy, :id => stock_location.to_param
-          response.status.should == 401
+          expect(response.status).to eq(401)
         end
       end
     end
@@ -93,24 +93,24 @@ module Spree
 
         it "gets stock location information" do
           api_get :index
-          json_response['stock_locations'].first.should have_attributes(attributes)
-          json_response['stock_locations'].first['country'].should_not be_nil
-          json_response['stock_locations'].first['state'].should_not be_nil
+          expect(json_response['stock_locations'].first).to have_attributes(attributes)
+          expect(json_response['stock_locations'].first['country']).not_to be_nil
+          expect(json_response['stock_locations'].first['state']).not_to be_nil
         end
 
         it 'can control the page size through a parameter' do
           create(:stock_location)
           api_get :index, per_page: 1
-          json_response['count'].should == 1
-          json_response['current_page'].should == 1
-          json_response['pages'].should == 2
+          expect(json_response['count']).to eq(1)
+          expect(json_response['current_page']).to eq(1)
+          expect(json_response['pages']).to eq(2)
         end
 
         it 'can query the results through a paramter' do
           expected_result = create(:stock_location, name: 'South America')
           api_get :index, q: { name_cont: 'south' }
-          json_response['count'].should == 1
-          json_response['stock_locations'].first['name'].should eq expected_result.name
+          expect(json_response['count']).to eq(1)
+          expect(json_response['stock_locations'].first['name']).to eq expected_result.name
         end
 
       end
@@ -140,8 +140,8 @@ module Spree
           }
 
           api_post :create, params
-          response.status.should == 201
-          json_response.should have_attributes(attributes)
+          expect(response.status).to eq(201)
+          expect(json_response).to have_attributes(attributes)
         end
       end
 
@@ -155,16 +155,16 @@ module Spree
           }
 
           api_put :update, params
-          response.status.should == 200
-          json_response['name'].should eq 'South Pole'
+          expect(response.status).to eq(200)
+          expect(json_response['name']).to eq 'South Pole'
         end
       end
 
       describe "#destroy" do
         it "can delete a stock location" do
           api_delete :destroy, id: stock_location.to_param
-          response.status.should == 204
-          lambda { stock_location.reload }.should raise_error(ActiveRecord::RecordNotFound)
+          expect(response.status).to eq(204)
+          expect { stock_location.reload }.to raise_error(ActiveRecord::RecordNotFound)
         end
       end
     end

data/spec/controllers/spree/api/stores_controller_spec.rb

@@ -25,7 +25,7 @@ module Spree
 
       it "I can list the available stores" do
         api_get :index
-        expect(json_response["stores"]).to eq([
+        expect(json_response["stores"]).to match_array([
           {
             "id" => store.id,
             "name" => "My Spree Store",

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

@@ -24,32 +24,32 @@ module Spree
       it "can see a paginated list of variants" do
         api_get :index
         first_variant = json_response["variants"].first
-        first_variant.should have_attributes(show_attributes)
-        first_variant["stock_items"].should be_present
-        json_response["count"].should == 1
-        json_response["current_page"].should == 1
-        json_response["pages"].should == 1
+        expect(first_variant).to have_attributes(show_attributes)
+        expect(first_variant["stock_items"]).to be_present
+        expect(json_response["count"]).to eq(1)
+        expect(json_response["current_page"]).to eq(1)
+        expect(json_response["pages"]).to eq(1)
       end
 
       it 'can control the page size through a parameter' do
         create(:variant)
         api_get :index, :per_page => 1
-        json_response['count'].should == 1
-        json_response['current_page'].should == 1
-        json_response['pages'].should == 3
+        expect(json_response['count']).to eq(1)
+        expect(json_response['current_page']).to eq(1)
+        expect(json_response['pages']).to eq(3)
       end
 
       it 'can query the results through a paramter' do
         expected_result = create(:variant, :sku => 'FOOBAR')
         api_get :index, :q => { :sku_cont => 'FOO' }
-        json_response['count'].should == 1
-        json_response['variants'].first['sku'].should eq expected_result.sku
+        expect(json_response['count']).to eq(1)
+        expect(json_response['variants'].first['sku']).to eq expected_result.sku
       end
 
       it "variants returned contain option values data" do
         api_get :index
         option_values = json_response["variants"].last["option_values"]
-        option_values.first.should have_attributes([:name,
+        expect(option_values.first).to have_attributes([:name,
                                                    :presentation,
                                                    :option_type_name,
                                                    :option_type_id])
@@ -60,8 +60,8 @@ module Spree
 
         api_get :index
 
-        json_response["variants"].last.should have_attributes([:images])
-        json_response['variants'].first['images'].first.should have_attributes([:attachment_file_name,
+        expect(json_response["variants"].last).to have_attributes([:images])
+        expect(json_response['variants'].first['images'].first).to have_attributes([:attachment_file_name,
                                                                                  :attachment_width,
                                                                                  :attachment_height,
                                                                                  :attachment_content_type,
@@ -80,12 +80,12 @@ module Spree
 
         it "is not returned in the results" do
           api_get :index
-          json_response["variants"].count.should == 0
+          expect(json_response["variants"].count).to eq(0)
         end
 
         it "is not returned even when show_deleted is passed" do
           api_get :index, :show_deleted => true
-          json_response["variants"].count.should == 0
+          expect(json_response["variants"].count).to eq(0)
         end
       end
 
@@ -119,10 +119,10 @@ module Spree
         it "can select the next page of variants" do
           second_variant = create(:variant)
           api_get :index, :page => 2, :per_page => 1
-          json_response["variants"].first.should have_attributes(show_attributes)
-          json_response["total_count"].should == 3
-          json_response["current_page"].should == 2
-          json_response["pages"].should == 3
+          expect(json_response["variants"].first).to have_attributes(show_attributes)
+          expect(json_response["total_count"]).to eq(3)
+          expect(json_response["current_page"]).to eq(2)
+          expect(json_response["pages"]).to eq(3)
         end
       end
 
@@ -145,10 +145,10 @@ module Spree
 
       it "can see a single variant" do
         api_get :show, :id => variant.to_param
-        json_response.should have_attributes(show_attributes)
-        json_response["stock_items"].should be_present
+        expect(json_response).to have_attributes(show_attributes)
+        expect(json_response["stock_items"]).to be_present
         option_values = json_response["option_values"]
-        option_values.first.should have_attributes([:name,
+        expect(option_values.first).to have_attributes([:name,
                                                    :presentation,
                                                    :option_type_name,
                                                    :option_type_id])
@@ -159,9 +159,9 @@ module Spree
 
         api_get :show, :id => variant.to_param
 
-        json_response.should have_attributes(show_attributes + [:images])
+        expect(json_response).to have_attributes(show_attributes + [:images])
         option_values = json_response["option_values"]
-        option_values.first.should have_attributes([:name,
+        expect(option_values.first).to have_attributes([:name,
                                                    :presentation,
                                                    :option_type_name,
                                                    :option_type_id])

data/spec/spec_helper.rb

@@ -17,8 +17,8 @@ ENV["RAILS_ENV"] ||= 'test'
 begin
   require File.expand_path("../dummy/config/environment", __FILE__)
 rescue LoadError
-  puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
-  exit
+  $stderr.puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
+  exit 1
 end
 
 require 'rspec/rails'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre3
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre3
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -129,10 +129,6 @@ files:
 - app/views/spree/api/option_types/show.v1.rabl
 - app/views/spree/api/option_values/index.v1.rabl
 - app/views/spree/api/option_values/show.v1.rabl
-- app/views/spree/api/orders/address.v1.rabl
-- app/views/spree/api/orders/canceled.v1.rabl
-- app/views/spree/api/orders/cart.v1.rabl
-- app/views/spree/api/orders/complete.v1.rabl
 - app/views/spree/api/orders/could_not_apply_coupon.v1.rabl
 - app/views/spree/api/orders/could_not_transition.v1.rabl
 - app/views/spree/api/orders/expected_total_mismatch.v1.rabl
@@ -140,7 +136,6 @@ files:
 - app/views/spree/api/orders/invalid_shipping_method.v1.rabl
 - app/views/spree/api/orders/mine.v1.rabl
 - app/views/spree/api/orders/order.v1.rabl
-- app/views/spree/api/orders/payment.v1.rabl
 - app/views/spree/api/orders/show.v1.rabl
 - app/views/spree/api/payments/credit_over_limit.v1.rabl
 - app/views/spree/api/payments/index.v1.rabl

data/app/views/spree/api/orders/payment.v1.rabl

@@ -1,3 +0,0 @@
-child :available_payment_methods => :payment_methods do
-  attributes :id, :name, :environment, :method_type
-end