solidus_api 1.0.7 → 1.1.0.beta1

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

@@ -38,9 +38,9 @@ describe Spree::Api::ShipmentsController, :type => :controller do
           shipment: { order_id: order.number },
           stock_location_id: stock_location.to_param
         }
-      end 
-      
-      subject do 
+      end
+
+      subject do
         api_post :create, params
       end
 
@@ -139,18 +139,17 @@ describe Spree::Api::ShipmentsController, :type => :controller do
 
     describe '#mine' do
       subject do
-        api_get :mine, format: 'json', params: params
+        api_get :mine, params
       end
 
       let(:params) { {} }
 
-      before { subject }
-
       context "the current api user is authenticated and has orders" do
         let(:current_api_user) { shipped_order.user }
         let(:shipped_order) { create(:shipped_order) }
 
         it 'succeeds' do
+          subject
           expect(response.status).to eq 200
         end
 
@@ -160,6 +159,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
           let(:rendered_shipment_ids) { json_response['shipments'].map { |s| s['id'] } }
 
           it 'contains the shipments' do
+            subject
             expect(rendered_shipment_ids).to match_array current_api_user.orders.flat_map(&:shipments).map(&:id)
           end
         end
@@ -167,9 +167,10 @@ describe Spree::Api::ShipmentsController, :type => :controller do
         context 'with filtering' do
           let(:params) { {q: {order_completed_at_not_null: 1}} }
 
-          let!(:incomplete_order) { create(:order, user: current_api_user) }
+          let!(:incomplete_order) { create(:order_with_line_items, user: current_api_user) }
 
           it 'filters' do
+            subject
             expect(assigns(:shipments).map(&:id)).to match_array current_api_user.orders.complete.flat_map(&:shipments).map(&:id)
           end
         end
@@ -179,6 +180,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
         let(:current_api_user) { nil }
 
         it "returns a 401" do
+          subject
           expect(response.status).to eq(401)
         end
       end
@@ -205,8 +207,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
 
       context "send_mailer not present" do
         it "sends the shipped shipments mailer" do
-          with_test_mail { subject }
-          expect(ActionMailer::Base.deliveries.size).to eq 1
+          expect { subject }.to change { ActionMailer::Base.deliveries.size }.by(1)
           expect(ActionMailer::Base.deliveries.last.subject).to match /Shipment Notification/
         end
       end
@@ -214,16 +215,14 @@ describe Spree::Api::ShipmentsController, :type => :controller do
       context "send_mailer set to false" do
         let(:send_mailer) { 'false' }
         it "does not send the shipped shipments mailer" do
-          with_test_mail { subject }
-          expect(ActionMailer::Base.deliveries.size).to eq 0
+          expect { subject }.to_not change { ActionMailer::Base.deliveries.size }
         end
       end
 
       context "send_mailer set to true" do
         let(:send_mailer) { 'true' }
         it "sends the shipped shipments mailer" do
-          with_test_mail { subject }
-          expect(ActionMailer::Base.deliveries.size).to eq 1
+          expect { subject }.to change { ActionMailer::Base.deliveries.size }.by(1)
           expect(ActionMailer::Base.deliveries.last.subject).to match /Shipment Notification/
         end
       end

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

@@ -55,7 +55,7 @@ module Spree
           }
 
           api_post :create, params
-          expect(response.status).to eq(404)
+          expect(response.status).to eq(401)
         end
       end
 
@@ -85,7 +85,7 @@ module Spree
 
       it 'requires a stock_location_id to be passed as a parameter' do
         api_get :index
-        expect(json_response['error']).to match(/stock_location_id parameter must be provided/)
+        expect(json_response['exception']).to eq('param is missing or the value is empty: stock_location_id')
         expect(response.status).to eq(422)
       end
 

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

@@ -78,9 +78,9 @@ module Spree
         assert_not_found!
       end
 
-      it "can delete itself" do
+      it "cannot delete itself" do
         api_delete :destroy, id: user.id, token: user.spree_api_key
-        expect(response.status).to eq(204)
+        expect(response.status).to eq(401)
       end
 
       it "cannot delete other user" do

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

@@ -12,7 +12,7 @@ module Spree
     end
 
     let!(:base_attributes) { Api::ApiHelpers.variant_attributes }
-    let!(:show_attributes) { base_attributes.dup.push(:in_stock, :display_price) }
+    let!(:show_attributes) { base_attributes.dup.push(:in_stock, :display_price, :variant_properties) }
     let!(:new_attributes) { base_attributes }
 
     before do
@@ -143,8 +143,10 @@ module Spree
 
     describe "#show" do
 
+      subject { api_get :show, id: variant.to_param }
+
       it "can see a single variant" do
-        api_get :show, :id => variant.to_param
+        subject
         expect(json_response).to have_attributes(show_attributes)
         expect(json_response["stock_items"]).to be_present
         option_values = json_response["option_values"]
@@ -157,7 +159,7 @@ module Spree
       it "can see a single variant with images" do
         variant.images.create!(:attachment => image("thinking-cat.jpg"))
 
-        api_get :show, :id => variant.to_param
+        subject
 
         expect(json_response).to have_attributes(show_attributes + [:images])
         option_values = json_response["option_values"]
@@ -166,6 +168,33 @@ module Spree
                                                    :option_type_name,
                                                    :option_type_id])
       end
+
+      context "variant doesn't have variant properties" do
+        before { subject }
+
+        it "contains the expected attributes" do
+          expect(json_response).to have_attributes(show_attributes)
+        end
+
+        it "variant properties is an empty list" do
+          expect(json_response["variant_properties"]).to eq []
+        end
+      end
+
+      context "variant has variant properties" do
+        let!(:rule) { create(:variant_property_rule, product: variant.product, option_value: variant.option_values.first) }
+
+        before { subject }
+
+        it "contains the expected attributes" do
+          expect(json_response).to have_attributes(show_attributes)
+        end
+
+        it "variant properties is an array of variant property values" do
+          expected_attrs = [:id, :property_id, :value, :property_name]
+          expect(json_response["variant_properties"].first).to have_attributes(expected_attrs)
+        end
+      end
     end
 
     it "can learn how to create a new variant" do

data/spec/models/spree/legacy_user_spec.rb

@@ -15,9 +15,15 @@ module Spree
     end
 
     it "can clear an API key" do
+      user.spree_api_key = 'abc123'
       expect(user).to receive(:save!)
-      user.clear_spree_api_key!
-      expect(user.spree_api_key).to be_blank
+      expect { user.clear_spree_api_key! }.to change(user, :spree_api_key).to be_blank
+    end
+
+    it "can clear an api key without persisting" do
+      user.spree_api_key = 'abc123'
+      expect(user).not_to receive(:save!)
+      expect { user.clear_spree_api_key }.to change(user, :spree_api_key).to be_blank
     end
 
     context "admin role auto-api-key grant" do # so the admin user can do admin api actions

data/spec/spec_helper.rb

@@ -30,8 +30,6 @@ Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
-require 'spree/testing_support/mail'
-require 'spree/testing_support/authorization_helpers'
 
 require 'spree/api/testing_support/caching'
 require 'spree/api/testing_support/helpers'
@@ -41,12 +39,19 @@ RSpec.configure do |config|
   config.backtrace_exclusion_patterns = [/gems\/activesupport/, /gems\/actionpack/, /gems\/rspec/]
   config.color = true
   config.infer_spec_type_from_file_location!
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
+  config.mock_with :rspec do |c|
+    c.syntax = :expect
+  end
 
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, :type => :controller
   config.extend Spree::Api::TestingSupport::Setup, :type => :controller
   config.include Spree::TestingSupport::Preferences
-  config.include Spree::TestingSupport::Mail
+
+  config.extend WithModel
 
   config.fail_fast = ENV['FAIL_FAST'] || false
 

data/spec/test_views/spree/api/widgets/index.v1.rabl

@@ -0,0 +1,7 @@
+object false
+child(@collection => :widgets) do
+  extends "spree/api/widgets/show"
+end
+node(:count) { @collection.count }
+node(:current_page) { params[:page] || 1 }
+node(:pages) { @collection.num_pages }

data/spec/test_views/spree/api/widgets/new.v1.rabl

@@ -0,0 +1,2 @@
+object false
+node(:attributes) { [:name] }

data/spec/test_views/spree/api/widgets/show.v1.rabl

@@ -0,0 +1,2 @@
+object @object
+attributes :name, :position

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2015-09-30 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.7
+        version: 1.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -65,10 +65,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- CHANGELOG.md
 - Gemfile
 - LICENSE
 - Rakefile
+- app/controllers/spree/api/address_books_controller.rb
 - app/controllers/spree/api/addresses_controller.rb
 - app/controllers/spree/api/base_controller.rb
 - app/controllers/spree/api/checkouts_controller.rb
@@ -87,6 +87,7 @@ files:
 - app/controllers/spree/api/products_controller.rb
 - app/controllers/spree/api/promotions_controller.rb
 - app/controllers/spree/api/properties_controller.rb
+- app/controllers/spree/api/resource_controller.rb
 - app/controllers/spree/api/return_authorizations_controller.rb
 - app/controllers/spree/api/shipments_controller.rb
 - app/controllers/spree/api/states_controller.rb
@@ -105,6 +106,7 @@ files:
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/api_configuration.rb
 - app/models/spree/option_value_decorator.rb
+- app/views/spree/api/address_books/show.v1.rabl
 - app/views/spree/api/addresses/show.v1.rabl
 - app/views/spree/api/adjustments/show.v1.rabl
 - app/views/spree/api/config/money.v1.rabl
@@ -157,7 +159,6 @@ files:
 - app/views/spree/api/return_authorizations/index.v1.rabl
 - app/views/spree/api/return_authorizations/new.v1.rabl
 - app/views/spree/api/return_authorizations/show.v1.rabl
-- app/views/spree/api/shared/stock_location_required.v1.rabl
 - app/views/spree/api/shipments/big.v1.rabl
 - app/views/spree/api/shipments/cannot_ready_shipment.v1.rabl
 - app/views/spree/api/shipments/mine.v1.rabl
@@ -214,6 +215,7 @@ files:
 - lib/spree_api.rb
 - script/rails
 - solidus_api.gemspec
+- spec/controllers/spree/api/address_books_controller_spec.rb
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
@@ -233,6 +235,7 @@ files:
 - spec/controllers/spree/api/promotion_application_spec.rb
 - spec/controllers/spree/api/promotions_controller_spec.rb
 - spec/controllers/spree/api/properties_controller_spec.rb
+- spec/controllers/spree/api/resource_controller_spec.rb
 - spec/controllers/spree/api/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/api/states_controller_spec.rb
@@ -259,6 +262,9 @@ files:
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
 - spec/support/have_attributes_matcher.rb
+- spec/test_views/spree/api/widgets/index.v1.rabl
+- spec/test_views/spree/api/widgets/new.v1.rabl
+- spec/test_views/spree/api/widgets/show.v1.rabl
 homepage: http://solidus.io/
 licenses: []
 metadata: {}
@@ -273,16 +279,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.
 test_files:
+- spec/controllers/spree/api/address_books_controller_spec.rb
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
@@ -302,6 +309,7 @@ test_files:
 - spec/controllers/spree/api/promotion_application_spec.rb
 - spec/controllers/spree/api/promotions_controller_spec.rb
 - spec/controllers/spree/api/properties_controller_spec.rb
+- spec/controllers/spree/api/resource_controller_spec.rb
 - spec/controllers/spree/api/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
 - spec/controllers/spree/api/states_controller_spec.rb
@@ -328,3 +336,6 @@ test_files:
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
 - spec/support/have_attributes_matcher.rb
+- spec/test_views/spree/api/widgets/index.v1.rabl
+- spec/test_views/spree/api/widgets/new.v1.rabl
+- spec/test_views/spree/api/widgets/show.v1.rabl

data/CHANGELOG.md

@@ -1 +0,0 @@
-## Spree 2.4.0 (unreleased) ##

data/app/views/spree/api/shared/stock_location_required.v1.rabl

@@ -1,2 +0,0 @@
-object false
-node(:error) { I18n.t(:stock_location_required, scope: "spree.api") }