spree_api 2.3.13 → 2.4.0.rc1

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

@@ -1,51 +1,53 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::UsersController, :type => :controller do
+  describe Api::UsersController do
     render_views
 
-    let(:user) { create(:user, spree_api_key: rand.to_s) }
+    let(:user) { create(:user) }
     let(:stranger) { create(:user, :email => 'stranger@example.com') }
     let(:attributes) { [:id, :email, :created_at, :updated_at] }
 
+    before { stub_authentication! }
+
     context "as a normal user" do
+      before do
+        controller.stub :try_spree_current_user => user
+      end
+
       it "can get own details" do
-        api_get :show, id: user.id, token: user.spree_api_key
+        api_get :show, :id => user.id
 
-        expect(json_response['email']).to eq user.email
+        json_response['email'].should eq user.email
       end
 
       it "cannot get other users details" do
-        api_get :show, id: stranger.id, token: user.spree_api_key
+        api_get :show, :id => stranger.id
 
         assert_not_found!
       end
 
       it "can learn how to create a new user" do
-        api_get :new, token: user.spree_api_key
-        expect(json_response["attributes"]).to eq(attributes.map(&:to_s))
+        api_get :new
+        json_response["attributes"].should == attributes.map(&:to_s)
       end
 
       it "can create a new user" do
-        user_params = {
-          :email => 'new@example.com', :password => 'spree123', :password_confirmation => 'spree123'
-        }
-
-        api_post :create, :user => user_params, token: user.spree_api_key
-        expect(json_response['email']).to eq 'new@example.com'
+        api_post :create, :user => { :email => 'new@example.com', :password => 'spree123', :password_confirmation => 'spree123' }
+        json_response['email'].should eq 'new@example.com'
       end
 
       # there's no validations on LegacyUser?
       xit "cannot create a new user with invalid attributes" do
-        api_post :create, :user => {}, token: user.spree_api_key
-        expect(response.status).to eq(422)
-        expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
+        api_post :create, :user => {}
+        response.status.should == 422
+        json_response["error"].should == "Invalid resource. Please fix errors and try again."
         errors = json_response["errors"]
       end
 
       it "can update own details" do
         country = create(:country)
-        api_put :update, id: user.id, token: user.spree_api_key, user: {
+        api_put :update, id: user.id, user: {
           email: "mine@example.com",
           bill_address_attributes: {
             first_name: 'First',
@@ -74,78 +76,76 @@ module Spree
       end
 
       it "cannot update other users details" do
-        api_put :update, id: stranger.id, token: user.spree_api_key, user: { :email => "mine@example.com" }
+        api_put :update, :id => stranger.id, :user => { :email => "mine@example.com" }
         assert_not_found!
       end
 
       it "can delete itself" do
-        api_delete :destroy, id: user.id, token: user.spree_api_key
-        expect(response.status).to eq(204)
+        api_delete :destroy, :id => user.id
+        response.status.should == 204
       end
 
       it "cannot delete other user" do
-        api_delete :destroy, id: stranger.id, token: user.spree_api_key
+        api_delete :destroy, :id => stranger.id
         assert_not_found!
       end
 
       it "should only get own details on index" do
         2.times { create(:user) }
-        api_get :index, token: user.spree_api_key
+        api_get :index
 
-        expect(Spree.user_class.count).to eq 3
-        expect(json_response['count']).to eq 1
-        expect(json_response['users'].size).to eq 1
+        Spree.user_class.count.should eq 3
+        json_response['count'].should eq 1
+        json_response['users'].size.should eq 1
       end
     end
 
     context "as an admin" do
-      before { stub_authentication! }
-
       sign_in_as_admin!
 
       it "gets all users" do
-        allow(Spree::LegacyUser).to receive(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
+        Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
 
         2.times { create(:user) }
 
         api_get :index
-        expect(Spree.user_class.count).to eq 2
-        expect(json_response['count']).to eq 2
-        expect(json_response['users'].size).to eq 2
+        Spree.user_class.count.should eq 2
+        json_response['count'].should eq 2
+        json_response['users'].size.should eq 2
       end
 
       it 'can control the page size through a parameter' do
         2.times { create(:user) }
         api_get :index, :per_page => 1
-        expect(json_response['count']).to eq(1)
-        expect(json_response['current_page']).to eq(1)
-        expect(json_response['pages']).to eq(2)
+        json_response['count'].should == 1
+        json_response['current_page'].should == 1
+        json_response['pages'].should == 2
       end
 
       it 'can query the results through a paramter' do
         expected_result = create(:user, :email => 'brian@spreecommerce.com')
         api_get :index, :q => { :email_cont => 'brian' }
-        expect(json_response['count']).to eq(1)
-        expect(json_response['users'].first['email']).to eq expected_result.email
+        json_response['count'].should == 1
+        json_response['users'].first['email'].should eq expected_result.email
       end
 
       it "can create" do
         api_post :create, :user => { :email => "new@example.com", :password => 'spree123', :password_confirmation => 'spree123' }
-        expect(json_response).to have_attributes(attributes)
-        expect(response.status).to eq(201)
+        json_response.should have_attributes(attributes)
+        response.status.should == 201
       end
 
       it "can destroy user without orders" do
         user.orders.destroy_all
         api_delete :destroy, :id => user.id
-        expect(response.status).to eq(204)
+        response.status.should == 204
       end
 
       it "cannot destroy user with orders" do
         create(:completed_order_with_totals, :user => user)
         api_delete :destroy, :id => user.id
-        expect(json_response["exception"]).to eq "Spree::Core::DestroyWithOrdersError"
-        expect(response.status).to eq(422)
+        json_response["exception"].should eq "Spree::Core::DestroyWithOrdersError"
+        response.status.should == 422
       end
 
     end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::VariantsController, :type => :controller do
+  describe Api::VariantsController do
     render_views
 
     let!(:product) { create(:product) }
@@ -22,32 +22,32 @@ module Spree
     it "can see a paginated list of variants" do
       api_get :index
       first_variant = json_response["variants"].first
-      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)
+      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
     end
 
     it 'can control the page size through a parameter' do
       create(:variant)
       api_get :index, :per_page => 1
-      expect(json_response['count']).to eq(1)
-      expect(json_response['current_page']).to eq(1)
-      expect(json_response['pages']).to eq(3)
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 3
     end
 
-    it 'can query the results through a paramter' do
+    it 'can query the results through a parameter' do
       expected_result = create(:variant, :sku => 'FOOBAR')
       api_get :index, :q => { :sku_cont => 'FOO' }
-      expect(json_response['count']).to eq(1)
-      expect(json_response['variants'].first['sku']).to eq expected_result.sku
+      json_response['count'].should == 1
+      json_response['variants'].first['sku'].should eq expected_result.sku
     end
 
     it "variants returned contain option values data" do
       api_get :index
       option_values = json_response["variants"].last["option_values"]
-      expect(option_values.first).to have_attributes([:name,
+      option_values.first.should have_attributes([:name,
                                                  :presentation,
                                                  :option_type_name,
                                                  :option_type_id])
@@ -58,8 +58,8 @@ module Spree
 
       api_get :index
 
-      expect(json_response["variants"].last).to have_attributes([:images])
-      expect(json_response['variants'].first['images'].first).to have_attributes([:attachment_file_name,
+      json_response["variants"].last.should have_attributes([:images])
+      json_response['variants'].first['images'].first.should have_attributes([:attachment_file_name,
                                                                                :attachment_width,
                                                                                :attachment_height,
                                                                                :attachment_content_type,
@@ -70,6 +70,11 @@ module Spree
 
     end
 
+    it 'variants returned do not contain cost price data' do
+      api_get :index
+      expect(json_response["variants"].first.has_key?(:cost_price)).to eq false
+    end
+
     # Regression test for #2141
     context "a deleted variant" do
       before do
@@ -78,12 +83,12 @@ module Spree
 
       it "is not returned in the results" do
         api_get :index
-        expect(json_response["variants"].count).to eq(0)
+        json_response["variants"].count.should == 0
       end
 
       it "is not returned even when show_deleted is passed" do
         api_get :index, :show_deleted => true
-        expect(json_response["variants"].count).to eq(0)
+        json_response["variants"].count.should == 0
       end
     end
 
@@ -91,19 +96,19 @@ module Spree
       it "can select the next page of variants" do
         second_variant = create(:variant)
         api_get :index, :page => 2, :per_page => 1
-        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)
+        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
       end
     end
 
     it "can see a single variant" do
       api_get :show, :id => variant.to_param
-      expect(json_response).to have_attributes(show_attributes)
-      expect(json_response["stock_items"]).to be_present
+      json_response.should have_attributes(show_attributes)
+      json_response["stock_items"].should be_present
       option_values = json_response["option_values"]
-      expect(option_values.first).to have_attributes([:name,
+      option_values.first.should have_attributes([:name,
                                                  :presentation,
                                                  :option_type_name,
                                                  :option_type_id])
@@ -114,9 +119,9 @@ module Spree
 
       api_get :show, :id => variant.to_param
 
-      expect(json_response).to have_attributes(show_attributes + [:images])
+      json_response.should have_attributes(show_attributes + [:images])
       option_values = json_response["option_values"]
-      expect(option_values.first).to have_attributes([:name,
+      option_values.first.should have_attributes([:name,
                                                  :presentation,
                                                  :option_type_name,
                                                  :option_type_id])
@@ -124,8 +129,8 @@ module Spree
 
     it "can learn how to create a new variant" do
       api_get :new
-      expect(json_response["attributes"]).to eq(new_attributes.map(&:to_s))
-      expect(json_response["required_attributes"]).to be_empty
+      json_response["attributes"].should == new_attributes.map(&:to_s)
+      json_response["required_attributes"].should be_empty
     end
 
     it "cannot create a new variant if not an admin" do
@@ -141,7 +146,7 @@ module Spree
     it "cannot delete a variant" do
       api_delete :destroy, :id => variant.to_param
       assert_not_found!
-      expect { variant.reload }.not_to raise_error
+      lambda { variant.reload }.should_not raise_error
     end
 
     context "as an admin" do
@@ -156,28 +161,33 @@ module Spree
 
         it "are visible by admin" do
           api_get :index, :show_deleted => 1
-          expect(json_response["variants"].count).to eq(1)
+          json_response["variants"].count.should == 1
         end
       end
 
       it "can create a new variant" do
         api_post :create, :variant => { :sku => "12345" }
-        expect(json_response).to have_attributes(new_attributes)
-        expect(response.status).to eq(201)
-        expect(json_response["sku"]).to eq("12345")
+        json_response.should have_attributes(new_attributes)
+        response.status.should == 201
+        json_response["sku"].should == "12345"
 
-        expect(variant.product.variants.count).to eq(1)
+        variant.product.variants.count.should == 1
       end
 
       it "can update a variant" do
         api_put :update, :id => variant.to_param, :variant => { :sku => "12345" }
-        expect(response.status).to eq(200)
+        response.status.should == 200
       end
 
       it "can delete a variant" do
         api_delete :destroy, :id => variant.to_param
-        expect(response.status).to eq(204)
-        expect { Spree::Variant.find(variant.id) }.to raise_error(ActiveRecord::RecordNotFound)
+        response.status.should == 204
+        lambda { Spree::Variant.find(variant.id) }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it 'variants returned contain cost price data' do
+        api_get :index
+        expect(json_response["variants"].first.has_key?(:cost_price)).to eq true
       end
     end
   end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::ZonesController, :type => :controller do
+  describe Api::ZonesController do
     render_views
 
     let!(:attributes) { [:id, :name, :zone_members] }
@@ -13,29 +13,51 @@ module Spree
 
     it "gets list of zones" do
       api_get :index
-      expect(json_response['zones'].first).to have_attributes(attributes)
+      json_response['zones'].first.should have_attributes(attributes)
     end
 
     it 'can control the page size through a parameter' do
       create(:zone)
       api_get :index, :per_page => 1
-      expect(json_response['count']).to eq(1)
-      expect(json_response['current_page']).to eq(1)
-      expect(json_response['pages']).to eq(2)
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 2
     end
 
     it 'can query the results through a paramter' do
       expected_result = create(:zone, :name => 'South America')
       api_get :index, :q => { :name_cont => 'south' }
-      expect(json_response['count']).to eq(1)
-      expect(json_response['zones'].first['name']).to eq expected_result.name
+      json_response['count'].should == 1
+      json_response['zones'].first['name'].should eq expected_result.name
     end
 
     it "gets a zone" do
       api_get :show, :id => @zone.id
-      expect(json_response).to have_attributes(attributes)
-      expect(json_response['name']).to eq @zone.name
-      expect(json_response['zone_members'].size).to eq @zone.zone_members.count
+      json_response.should have_attributes(attributes)
+      json_response['name'].should eq @zone.name
+      json_response['zone_members'].size.should eq @zone.zone_members.count
+    end
+
+    context "specifying a rabl template to use" do
+      before do
+        Spree::Api::ZonesController.class_eval do
+          def custom_show
+            respond_with(zone)
+          end
+        end
+      end
+
+      it "uses the specified template" do
+        request.headers['X-Spree-Template'] = 'show'
+        api_get :custom_show, :id => @zone.id
+        response.should render_template('spree/api/zones/show')
+      end
+
+      it "falls back to the default template if the specified template does not exist" do
+        request.headers['X-Spree-Template'] = 'invoice'
+        api_get :show, :id => @zone.id
+        response.should render_template('spree/api/zones/show')
+      end
     end
 
     context "as an admin" do
@@ -55,9 +77,9 @@ module Spree
         }
 
         api_post :create, params
-        expect(response.status).to eq(201)
-        expect(json_response).to have_attributes(attributes)
-        expect(json_response["zone_members"]).not_to be_empty
+        response.status.should == 201
+        json_response.should have_attributes(attributes)
+        json_response["zone_members"].should_not be_empty
       end
 
       it "updates a zone" do
@@ -74,15 +96,15 @@ module Spree
         }
 
         api_put :update, params
-        expect(response.status).to eq(200)
-        expect(json_response['name']).to eq 'North Pole'
-        expect(json_response['zone_members']).not_to be_blank
+        response.status.should == 200
+        json_response['name'].should eq 'North Pole'
+        json_response['zone_members'].should_not be_blank
       end
 
       it "can delete a zone" do
         api_delete :destroy, :id => @zone.id
-        expect(response.status).to eq(204)
-        expect { @zone.reload }.to raise_error(ActiveRecord::RecordNotFound)
+        response.status.should == 204
+        lambda { @zone.reload }.should raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end

data/spec/models/spree/legacy_user_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 module Spree
-  describe LegacyUser, :type => :model do
+  describe LegacyUser do
     let(:user) { LegacyUser.new }
 
     it "can generate an API key" do
-      expect(user).to receive(:save!)
+      user.should_receive(:save!)
       user.generate_spree_api_key!
-      expect(user.spree_api_key).not_to be_blank
+      user.spree_api_key.should_not be_blank
     end
 
     it "can clear an API key" do
-      expect(user).to receive(:save!)
+      user.should_receive(:save!)
       user.clear_spree_api_key!
-      expect(user.spree_api_key).to be_blank
+      user.spree_api_key.should be_blank
     end
   end
 end

data/spec/requests/rabl_cache_spec.rb

@@ -1,32 +1,32 @@
 require 'spec_helper'
 
-describe "Rabl Cache", :type => :request, :caching => true do
+describe "Rabl Cache", :caching => true do
   let!(:user)  { create(:admin_user) }
 
   before do
     create(:variant) 
     user.generate_spree_api_key!
-    expect(Spree::Product.count).to eq(1)
+    Spree::Product.count.should == 1
   end
   
   it "doesn't create a cache key collision for models with different rabl templates" do
     get "/api/variants", :token => user.spree_api_key
-    expect(response.status).to eq(200)
+    response.status.should == 200
 
     # Make sure we get a non master variant
     variant_a = JSON.parse(response.body)['variants'].select do |v|
       !v['is_master']
     end.first
 
-    expect(variant_a['is_master']).to be false
-    expect(variant_a['stock_items']).not_to be_nil
+    variant_a['is_master'].should be false
+    variant_a['stock_items'].should_not be_nil
 
     get "/api/products/#{Spree::Product.first.id}", :token => user.spree_api_key
-    expect(response.status).to eq(200)
+    response.status.should == 200
     variant_b = JSON.parse(response.body)['variants'].last
-    expect(variant_b['is_master']).to be false
+    variant_b['is_master'].should be false
 
-    expect(variant_a['id']).to eq(variant_b['id'])
-    expect(variant_b['stock_items']).to be_nil
+    variant_a['id'].should == variant_b['id']
+    variant_b['stock_items'].should be_nil
   end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ rescue LoadError
 end
 
 require 'rspec/rails'
+require 'rspec/autorun'
 require 'ffaker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.4.0.rc1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2014-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.13
+        version: 2.4.0.rc1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,7 @@ files:
 - app/controllers/spree/api/payments_controller.rb
 - app/controllers/spree/api/product_properties_controller.rb
 - 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/return_authorizations_controller.rb
 - app/controllers/spree/api/shipments_controller.rb
@@ -109,6 +110,7 @@ files:
 - app/views/spree/api/errors/must_specify_api_key.v1.rabl
 - app/views/spree/api/errors/not_found.v1.rabl
 - app/views/spree/api/errors/unauthorized.v1.rabl
+- app/views/spree/api/images/index.v1.rabl
 - app/views/spree/api/images/show.v1.rabl
 - app/views/spree/api/inventory_units/show.rabl
 - app/views/spree/api/line_items/new.v1.rabl
@@ -142,6 +144,7 @@ files:
 - app/views/spree/api/products/product.v1.rabl
 - app/views/spree/api/products/show.v1.rabl
 - app/views/spree/api/promotions/handler.v1.rabl
+- app/views/spree/api/promotions/show.v1.rabl
 - app/views/spree/api/properties/index.v1.rabl
 - app/views/spree/api/properties/new.v1.rabl
 - app/views/spree/api/properties/show.v1.rabl
@@ -149,7 +152,9 @@ files:
 - 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
 - app/views/spree/api/shipments/show.v1.rabl
 - app/views/spree/api/shipments/small.v1.rabl
 - app/views/spree/api/shipping_rates/show.v1.rabl
@@ -215,6 +220,7 @@ files:
 - spec/controllers/spree/api/product_properties_controller_spec.rb
 - spec/controllers/spree/api/products_controller_spec.rb
 - 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/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
@@ -231,7 +237,6 @@ files:
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/legacy_user_spec.rb
 - spec/requests/rabl_cache_spec.rb
-- spec/requests/ransackable_attributes_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb
@@ -252,12 +257,12 @@ 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.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spree's API
@@ -279,6 +284,7 @@ test_files:
 - spec/controllers/spree/api/product_properties_controller_spec.rb
 - spec/controllers/spree/api/products_controller_spec.rb
 - 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/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
@@ -295,7 +301,6 @@ test_files:
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/legacy_user_spec.rb
 - spec/requests/rabl_cache_spec.rb
-- spec/requests/ransackable_attributes_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb