spree_api 2.4.4 → 2.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca43b49ea66d204fdeefd36be3e54a9e5a6bee02
-  data.tar.gz: 65645ed9ac2395b7fa3d971caaa314e5ee452690
+  metadata.gz: df85069fa27344d037168635f2c4ec87e02b9011
+  data.tar.gz: 8fbc76a068f2684e7bafd00bcf3e06ac8f5add06
 SHA512:
-  metadata.gz: 5c2f8a7e39ada5e2fc32f2557f4ae89926bd6d1e5af6a28c537a868ccd0756fe9cd712c4ccd603f6515e44bca9b7e5ca8cd592c3fd92dd9d1bc239a734ad9164
-  data.tar.gz: 8178a618dcbf35bd1759368ff8e218156287a76a2ee91692a611519d86fef823441dbb668e4ad8f4718fedf7c54539fd2d1e565f8a19129dfec2f1f45335f6a8
+  metadata.gz: 144367eaf50a16d2d40d1ed194265f471f2d8098b918306b9ba96cbd1e0822cb9cd4434c579026585a133621f79d32ee6c37b48166b24f9b285fcfd12d003d46
+  data.tar.gz: 2acc72fc6fad8788ef7b42b9a007ede5afb66cc6c7bb2794144fbe18ce3ef0d47509aa21e442b8dd1bf2710aa17ddb26b2043ee7f38aaafdd474e556a7584b6d

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

@@ -67,7 +67,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

@@ -22,7 +22,7 @@ module Spree
         end
 
         def stub_authentication!
-          allow(Spree::LegacyUser).to receive(: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

@@ -11,17 +11,9 @@ describe Spree::Api::BaseController, :type => :controller do
     end
   end
 
-  context "signed in as a user using an authentication extension" do
-    before do
-      user = double(:email => "spree@example.com")
-      allow(user).to receive_message_chain :spree_roles, pluck: []
-      allow(controller).to receive_messages :try_spree_current_user => user
-    end
-
-    it "can make a request" do
-      api_get :index
-      expect(json_response).to eq({ "products" => [] })
-      expect(response.status).to eq(200)
+  before do
+    @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+      r.draw { get 'index', to: 'spree/api/base#index' }
     end
   end
 
@@ -117,13 +109,15 @@ describe Spree::Api::BaseController, :type => :controller do
     before do
       user = double(email: "spree@example.com")
       allow(user).to receive_message_chain :spree_roles, pluck: []
-      allow(controller).to receive_messages try_spree_current_user: user
-      routes.draw { get 'foo' => 'fakes#foo' }
+      allow(Spree.user_class).to receive_messages find_by: user
+      @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
+        r.draw { get 'foo' => 'fakes#foo' }
+      end
     end
 
     it 'should notify notify_error_during_processing' do
       expect(MockHoneybadger).to receive(:notify_or_ignore).once.with(kind_of(Exception), rack_env: kind_of(Hash))
-      api_get :foo
+      api_get :foo, token: 123
       expect(response.status).to eq(422)
     end
   end

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

@@ -21,8 +21,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
-      allow(controller).to receive_messages :try_spree_current_user => current_api_user
       api_get :new
       expect(json_response["attributes"]).to eq(["quantity", "price", "variant_id"])
       required_attributes = json_response["required_attributes"]
@@ -48,7 +51,6 @@ module Spree
 
     context "as the order owner" do
       before do
-        allow(controller).to receive_messages :try_spree_current_user => current_api_user
         allow_any_instance_of(Order).to receive_messages :user => current_api_user
       end
 
@@ -157,7 +159,6 @@ module Spree
     context "as just another user" do
       before do
         user = create(:user)
-        allow(controller).to receive_messages :try_spree_current_user => user
       end
 
       it "cannot add a new line item to the order" do

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

@@ -238,7 +238,7 @@ module Spree
         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(controller).to receive_messages try_spree_current_user: user
+        allow(Spree.user_class).to receive_messages find_by: user
         api_get :show, :id => order.to_param
         expect(response.status).to eq(200)
       end

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

@@ -4,42 +4,40 @@ module Spree
   describe Api::UsersController, :type => :controller 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
-        allow(controller).to receive_messages :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
 
         expect(json_response['email']).to 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
+        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' }
+        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 => {}
+        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"]
@@ -47,7 +45,7 @@ module Spree
 
       it "can update own details" do
         country = create(:country)
-        api_put :update, id: user.id, user: {
+        api_put :update, id: user.id, token: user.spree_api_key, user: {
           email: "mine@example.com",
           bill_address_attributes: {
             first_name: 'First',
@@ -76,23 +74,23 @@ module Spree
       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
+        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
 
         expect(Spree.user_class.count).to eq 3
         expect(json_response['count']).to eq 1
@@ -101,6 +99,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.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-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.4.4
+        version: 2.4.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.4.5
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement