spree_api 2.2.9 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4054c45aa7f1dd4b9117a0c93e50dd091b9127c5
-  data.tar.gz: 9cede9c151509a65bdec3a800ff420f203df7b48
+  metadata.gz: c1e4f94cd07462a030047555911538bcaf13cba8
+  data.tar.gz: f35bbca0a030a0627ee12d6e53689e52b83c3956
 SHA512:
-  metadata.gz: bce419abf3f9a6073307b79a5630c1fcee32a794677824eaa9fa4a1f1f212ac18f5677e50fe9386a6b3aaec113983b176e66f13a86bc7d1a2637137859754daa
-  data.tar.gz: 6a13db2891ded39d5051ea07d7fcc2c3d045f12c5a07aba191d84dabc23fce875fbcd1342bfb9f09de1fb4d5d9d97cfda8a8ed166c610a2e327ead4851a829d9
+  metadata.gz: fc7bb77eff861a8585824f001119058b5388be6cd27f09605785cae8b20e62e6d3c04eaadf836b4524c2b74d7cc1cd2bb56e2972f6a27879af24c5da558d0b0f
+  data.tar.gz: f0bf714d8696e7abb69a6f56d9626821216b4aab9005aec55d0fa8d890e062480db1006a1aadc485e18ee34a83a3d7da9df0e4c24adf66807e6610e5972da6cf

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

@@ -61,7 +61,7 @@ module Spree
       end
 
       def load_user
-        @current_api_user = (try_spree_current_user || Spree.user_class.find_by(spree_api_key: api_key.to_s))
+        @current_api_user = Spree.user_class.find_by(spree_api_key: api_key.to_s)
       end
 
       def authenticate_user

data/lib/spree/api/testing_support/helpers.rb

@@ -17,7 +17,7 @@ module Spree
         end
 
         def stub_authentication!
-          Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
+          allow(Spree.user_class).to receive(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
         end
 
         # This method can be overriden (with a let block) inside a context

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

@@ -8,16 +8,9 @@ describe Spree::Api::BaseController do
     end
   end
 
-  context "signed in as a user using an authentication extension" do
-    before do
-      controller.stub :try_spree_current_user => double(:email => "spree@example.com")
-      Spree::Api::Config[:requires_authentication] = true
-    end
-
-    it "can make a request" do
-      api_get :index
-      json_response.should == { "products" => [] }
-      response.status.should == 200
+  before do
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw { get 'index', to: 'spree/api/base#index' }
     end
   end
 

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

@@ -10,8 +10,11 @@ module Spree
     let(:attributes) { [:id, :quantity, :price, :variant, :total, :display_amount, :single_display_amount] }
     let(:resource_scoping) { { :order_id => order.to_param } }
 
+    before do
+      stub_authentication!
+    end
+
     it "can learn how to create a new line item" do
-      controller.stub :try_spree_current_user => current_api_user
       api_get :new
       json_response["attributes"].should == ["quantity", "price", "variant_id"]
       required_attributes = json_response["required_attributes"]
@@ -37,8 +40,7 @@ module Spree
 
     context "as the order owner" do
       before do
-        controller.stub :try_spree_current_user => current_api_user
-        Order.any_instance.stub :user => current_api_user
+        allow_any_instance_of(Order).to receive_messages :user => current_api_user
       end
 
       it "can add a new line item to an existing order" do
@@ -119,7 +121,8 @@ module Spree
     context "as just another user" do
       before do
         user = create(:user)
-        controller.stub :try_spree_current_user => user
+        allow(Spree.user_class).to receive(:find_by).
+                                     and_return(user)
       end
 
       it "cannot add a new line item to the order" do

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

@@ -135,9 +135,10 @@ module Spree
 
       it "can view an order" do
         user = mock_model(Spree::LegacyUser)
-        user.stub(:has_spree_role?).with('bar').and_return(true)
-        user.stub(:has_spree_role?).with('admin').and_return(false)
-        controller.stub try_spree_current_user: user
+        allow(user).to receive_message_chain(:spree_roles, :pluck).and_return(["bar"])
+        allow(user).to receive(:has_spree_role?).with('bar').and_return(true)
+        allow(user).to receive(:has_spree_role?).with('admin').and_return(false)
+        allow(Spree.user_class).to receive_messages find_by: user
         api_get :show, :id => order.to_param
         response.status.should == 200
       end

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

@@ -4,70 +4,68 @@ module Spree
   describe Api::UsersController do
     render_views
 
-    let(:user) { create(:user) }
+    let(:user) { create(:user, spree_api_key: rand) }
     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
+        api_get :show, id: user.id, token: user.spree_api_key
 
         json_response['email'].should eq user.email
       end
 
       it "cannot get other users details" do
-        api_get :show, :id => stranger.id
+        api_get :show, id: stranger.id, token: user.spree_api_key
 
         assert_not_found!
       end
 
       it "can learn how to create a new user" do
-        api_get :new
-        json_response["attributes"].should == attributes.map(&:to_s)
+        api_get :new, token: user.spree_api_key
+        expect(json_response["attributes"]).to eq(attributes.map(&:to_s))
       end
 
       it "can create a new user" do
-        api_post :create, :user => { :email => 'new@example.com', :password => 'spree123', :password_confirmation => 'spree123' }
-        json_response['email'].should eq 'new@example.com'
+        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'
       end
 
       # there's no validations on LegacyUser?
       xit "cannot create a new user with invalid attributes" do
-        api_post :create, :user => {}
-        response.status.should == 422
-        json_response["error"].should == "Invalid resource. Please fix errors and try again."
+        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.")
         errors = json_response["errors"]
       end
 
       it "can update own details" do
-        api_put :update, :id => user.id, :user => { :email => "mine@example.com" }
+        api_put :update, id: user.id, token: user.spree_api_key, 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, :user => { :email => "mine@example.com" }
+        api_put :update, id: stranger.id, token: user.spree_api_key, user: { :email => "mine@example.com" }
         assert_not_found!
       end
 
       it "can delete itself" do
-        api_delete :destroy, :id => user.id
-        response.status.should == 204
+        api_delete :destroy, id: user.id, token: user.spree_api_key
+        expect(response.status).to eq(204)
       end
 
       it "cannot delete other user" do
-        api_delete :destroy, :id => stranger.id
+        api_delete :destroy, id: stranger.id, token: user.spree_api_key
         assert_not_found!
       end
 
       it "should only get own details on index" do
         2.times { create(:user) }
-        api_get :index
+        api_get :index, token: user.spree_api_key
 
         Spree.user_class.count.should eq 3
         json_response['count'].should eq 1
@@ -76,6 +74,8 @@ module Spree
     end
 
     context "as an admin" do
+      before { stub_authentication! }
+
       sign_in_as_admin!
 
       it "gets all users" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-03-03 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.2.9
+        version: 2.2.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.9
+        version: 2.2.10
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Spree's API