spree_api 2.2.14 → 2.3.0

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

@@ -10,7 +10,7 @@ module Spree::Api
 
     context "with an available promotion" do
       let!(:order) { create(:order_with_line_items, :line_items_count => 1) }
-      let!(:promotion) do
+      let!(:promotion) do 
         promotion = Spree::Promotion.create(name: "10% off", code: "10off")
         calculator = Spree::Calculator::FlatPercentItemTotal.create(preferred_flat_percent: "10")
         action = Spree::Promotion::Actions::CreateItemAdjustments.create(calculator: calculator)
@@ -20,12 +20,12 @@ module Spree::Api
 
       it "can apply a coupon code to the order" do
         order.total.should == 110.00
-        api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.token
+        api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.guest_token
         response.status.should == 200
         order.reload.total.should == 109.00
         json_response["success"].should == "The coupon code was successfully applied to your order."
         json_response["error"].should be_blank
-        json_response["successful"].should be true
+        json_response["successful"].should be_true
       end
 
       context "with an expired promotion" do
@@ -36,11 +36,11 @@ module Spree::Api
         end
 
         it "fails to apply" do
-          api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.token
+          api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.guest_token
           response.status.should == 422
           json_response["success"].should be_blank
           json_response["error"].should == "The coupon code is expired"
-          json_response["successful"].should be false
+          json_response["successful"].should be_false
         end
       end
     end

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

@@ -52,7 +52,7 @@ describe Spree::Api::ShipmentsController do
       response.status.should == 200
       json_response['stock_location_name'].should == stock_location.name
     end
-    
+
     it "can make a shipment ready" do
       Spree::Order.any_instance.stub(:paid? => true, :complete? => true)
       api_put :ready
@@ -105,16 +105,6 @@ describe Spree::Api::ShipmentsController do
         json_response["state"].should == "shipped"
       end
 
-      context 'DEPRECATED:' do
-        it "can transition a shipment from ready to ship" do
-          ActiveSupport::Deprecation.should_receive(:warn).once
-          shipment.reload
-          api_put :ship, order_id: shipment.order.to_param, id: shipment.to_param, shipment: { tracking: "123123" }
-          json_response.should have_attributes(attributes)
-          json_response["state"].should == "shipped"
-        end
-      end
-
     end
   end
 end

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

@@ -47,7 +47,7 @@ module Spree
         children = json_response['root']['taxons']
         children.count.should eq 1
         children.first['name'].should eq taxon.name
-        children.first.key?('taxons').should be false
+        children.first.key?('taxons').should be_false
       end
 
       it "gets a single taxonomy with set=nested" do
@@ -56,7 +56,7 @@ module Spree
         json_response['name'].should eq taxonomy.name
 
         children = json_response['root']['taxons']
-        children.first.key?('taxons').should be true
+        children.first.key?('taxons').should be_true
       end
 
       it "gets the jstree-friendly version of a taxonomy" do

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

@@ -4,68 +4,70 @@ module Spree
   describe Api::UsersController do
     render_views
 
-    let(:user) { create(:user, spree_api_key: SecureRandom.hex) }
+    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
-        api_put :update, id: user.id, token: user.spree_api_key, user: { email: "mine@example.com" }
+        api_put :update, :id => user.id, :user => { :email => "mine@example.com" }
         json_response['email'].should eq 'mine@example.com'
       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
 
         Spree.user_class.count.should eq 3
         json_response['count'].should eq 1
@@ -74,8 +76,6 @@ module Spree
     end
 
     context "as an admin" do
-      before { stub_authentication! }
-
       sign_in_as_admin!
 
       it "gets all users" do

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

@@ -38,6 +38,28 @@ module Spree
       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
       sign_in_as_admin!
 

data/spec/requests/rabl_cache_spec.rb

@@ -18,13 +18,13 @@ describe "Rabl Cache", :caching => true do
       !v['is_master']
     end.first
 
-    variant_a['is_master'].should be false
+    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
     response.status.should == 200
     variant_b = JSON.parse(response.body)['variants'].last
-    variant_b['is_master'].should be false
+    variant_b['is_master'].should be_false
 
     variant_a['id'].should == variant_b['id']
     variant_b['stock_items'].should be_nil

data/spec/spec_helper.rb

@@ -39,7 +39,6 @@ require 'spree/api/testing_support/setup'
 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.include FactoryGirl::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, :type => :controller

data/spec/support/controller_hacks.rb

@@ -23,5 +23,5 @@ module ControllerHacks
 end
 
 RSpec.configure do |config|
-  config.include ControllerHacks, type: :controller
+  config.include ControllerHacks, :type => :controller
 end

data/spree_api.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = version
 
   gem.add_dependency 'spree_core', version
-  gem.add_dependency 'rabl', '0.9.3'
-  gem.add_dependency 'versioncake', '~> 1.2.0'
+  gem.add_dependency 'rabl', '~> 0.9.4.pre1'
+  gem.add_dependency 'versioncake', '~> 2.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.14
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2014-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.14
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.4.pre1
 - !ruby/object:Gem::Dependency
   name: versioncake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 2.3.1
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -121,7 +121,6 @@ files:
 - 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/delivery.v1.rabl
 - app/views/spree/api/orders/index.v1.rabl
 - app/views/spree/api/orders/invalid_shipping_method.v1.rabl
 - app/views/spree/api/orders/mine.v1.rabl
@@ -150,6 +149,7 @@ files:
 - app/views/spree/api/shared/stock_location_required.v1.rabl
 - app/views/spree/api/shipments/cannot_ready_shipment.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
 - app/views/spree/api/states/index.v1.rabl
 - app/views/spree/api/states/show.v1.rabl
@@ -194,7 +194,6 @@ files:
 - lib/spree/api/testing_support/caching.rb
 - lib/spree/api/testing_support/helpers.rb
 - lib/spree/api/testing_support/setup.rb
-- lib/spree/api/version.rb
 - lib/spree_api.rb
 - script/rails
 - spec/controllers/spree/api/addresses_controller_spec.rb
@@ -229,7 +228,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
@@ -255,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Spree's API
@@ -292,7 +290,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

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

@@ -1,3 +0,0 @@
-child(:shipments => :shipments) do
-  extends "spree/api/shipments/show"
-end

data/lib/spree/api/version.rb

@@ -1,5 +0,0 @@
-module Spree
-  module Api
-    VERSION = "1.1.0.beta"
-  end
-end

data/spec/requests/ransackable_attributes_spec.rb

@@ -1,79 +0,0 @@
-require 'spec_helper'
-
-describe "Ransackable Attributes" do
-  let(:user) { create(:user).tap(&:generate_spree_api_key!) }
-  let(:order) { create(:order_with_line_items, user: user) }
-  context "filtering by attributes one association away" do
-    it "does not allow the filtering of variants by order attributes" do
-      2.times { create(:variant) }
-
-      get "/api/variants?q[orders_email_start]=#{order.email}", token: user.spree_api_key
-
-      variants_response = JSON.parse(response.body)
-      expect(variants_response['total_count']).to eq(Spree::Variant.count)
-    end
-  end
-
-  context "filtering by attributes two associations away" do
-    it "does not allow the filtering of variants by user attributes" do
-      2.times { create(:variant) }
-
-      get "/api/variants?q[orders_user_email_start]=#{order.user.email}", token: user.spree_api_key
-
-      variants_response = JSON.parse(response.body)
-      expect(variants_response['total_count']).to eq(Spree::Variant.count)
-    end
-  end
-
-  context "it maintains desired association behavior" do
-    it "allows filtering of variants product name" do
-      product = create(:product, name: "Fritos")
-      variant = create(:variant, product: product)
-      other_variant = create(:variant)
-
-      get "/api/variants?q[product_name_or_sku_cont]=fritos", token: user.spree_api_key
-
-      skus = JSON.parse(response.body)['variants'].map { |variant| variant['sku'] }
-      expect(skus).to include variant.sku
-      expect(skus).not_to include other_variant.sku
-    end
-  end
-
-  context "filtering by attributes" do
-    it "most attributes are not filterable by default" do
-      product = create(:product, description: "special product")
-      other_product = create(:product)
-
-      get "/api/products?q[description_cont]=special", token: user.spree_api_key
-
-      products_response = JSON.parse(response.body)
-      expect(products_response['total_count']).to eq(Spree::Product.count)
-    end
-
-    it "id is filterable by default" do
-      product = create(:product)
-      other_product = create(:product)
-
-      get "/api/products?q[id_eq]=#{product.id}", token: user.spree_api_key
-
-      product_names = JSON.parse(response.body)['products'].map { |product| product['name'] }
-      expect(product_names).to include product.name
-      expect(product_names).not_to include other_product.name
-    end
-  end
-
-  context "filtering by whitelisted attributes" do
-    it "filtering is supported for whitelisted attributes" do
-      product = create(:product, name: "Fritos")
-      other_product = create(:product)
-
-      get "/api/products?q[name_cont]=fritos", token: user.spree_api_key
-
-      product_names = JSON.parse(response.body)['products'].map { |product| product['name'] }
-      expect(product_names).to include product.name
-      expect(product_names).not_to include other_product.name
-    end
-  end
-
-
-end