spree_api 2.0.13 → 2.1.0

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

@@ -13,76 +13,40 @@ module Spree
       stub_authentication!
     end
 
-    context "as a normal user" do
-      it "cannot list stock items for a stock location" do
-        api_get :index, stock_location_id: stock_location.to_param
-        response.status.should == 401
-      end
-
-      it "cannot see a stock item" do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
-        response.status.should == 401
-      end
+    it 'gets list of stock items' do
+      api_get :index, stock_location_id: stock_location.to_param
+      json_response['stock_items'].first.should have_attributes(attributes)
+      json_response['stock_items'].first['variant']['sku'].should eq 'ABC'
+    end
 
-      it "cannot create a stock item" do
-        variant = create(:variant)
-        params = {
-          stock_location_id: stock_location.to_param,
-          stock_item: {
-            variant_id: variant.id,
-            count_on_hand: '20'
-          }
-        }
+    it 'requires a stock_location_id to be passed as a parameter' do
+      api_get :index
+      json_response['error'].should =~ /stock_location_id parameter must be provided/
+      response.status.should == 422
+    end
 
-        api_post :create, params
-        response.status.should == 401
-      end
+    it 'can control the page size through a parameter' do
+      api_get :index, stock_location_id: stock_location.to_param, per_page: 1
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+    end
 
-      it "cannot update a stock item" do
-        api_put :update, stock_location_id: stock_location.to_param, stock_item_id: stock_item.to_param
-        response.status.should == 401
-      end
+    it 'can query the results through a paramter' do
+      stock_item.update_column(:count_on_hand, 30)
+      api_get :index, stock_location_id: stock_location.to_param, q: { count_on_hand_eq: '30' }
+      json_response['count'].should == 1
+      json_response['stock_items'].first['count_on_hand'].should eq 30
+    end
 
-      it "cannot destroy a stock item" do
-        api_delete :destroy, stock_location_id: stock_location.to_param, stock_item_id: stock_item.to_param
-        response.status.should == 401
-      end
+    it 'gets a stock item' do
+      api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
+      json_response.should have_attributes(attributes)
+      json_response['count_on_hand'].should eq stock_item.count_on_hand
     end
 
-    context "as an admin" do
+    context 'as an admin' do
       sign_in_as_admin!
 
-      it 'cannot list of stock items' do
-        api_get :index, stock_location_id: stock_location.to_param
-        json_response['stock_items'].first.should have_attributes(attributes)
-        json_response['stock_items'].first['variant']['sku'].should eq 'ABC'
-      end
-
-      it 'requires a stock_location_id to be passed as a parameter' do
-        api_get :index
-        json_response['error'].should =~ /stock_location_id parameter must be provided/
-        response.status.should == 422
-      end
-
-      it 'can control the page size through a parameter' do
-        api_get :index, stock_location_id: stock_location.to_param, per_page: 1
-        json_response['count'].should == 1
-        json_response['current_page'].should == 1
-      end
-
-      it 'can query the results through a paramter' do
-        stock_item.update_column(:count_on_hand, 30)
-        api_get :index, stock_location_id: stock_location.to_param, q: { count_on_hand_eq: '30' }
-        json_response['count'].should == 1
-        json_response['stock_items'].first['count_on_hand'].should eq 30
-      end
-
-      it 'gets a stock item' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_item.to_param
-        json_response.should have_attributes(attributes)
-        json_response['count_on_hand'].should eq stock_item.count_on_hand
-      end
-
       it 'can create a new stock item' do
         variant = create(:variant)
         # Creating a variant also creates stock items.

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

@@ -11,72 +11,45 @@ module Spree
       stub_authentication!
     end
 
-    context "as a user" do
-      it "cannot see stock locations" do
-        api_get :index
-        response.status.should == 401
-      end
+    it "gets list of stock locations" do
+      api_get :index
+      json_response['stock_locations'].first.should have_attributes(attributes)
+    end
 
-      it "cannot see a single stock location" do
-        api_get :show, :id => stock_location.id
-        response.status.should == 401
-      end
+    it "includes the country" do
+      api_get :index
+      json_response['stock_locations'].first['country'].should_not be_nil
+    end
 
-      it "cannot create a new stock location" do
-        params = {
-          stock_location: {
-            name: "North Pole",
-            active: true
-          }
-        }
+    it "includes the state" do
+      api_get :index
+      json_response['stock_locations'].first['state'].should_not be_nil
+    end
 
-        api_post :create, params
-        response.status.should == 401
-      end
+    it 'can control the page size through a parameter' do
+      create(:stock_location)
+      api_get :index, per_page: 1
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 2
+    end
 
-      it "cannot update a stock location" do
-        api_put :update, :stock_location => { :name => "South Pole" }, :id => stock_location.to_param
-        response.status.should == 401
-      end
+    it 'can query the results through a paramter' do
+      expected_result = create(:stock_location, name: 'South America')
+      api_get :index, q: { name_cont: 'south' }
+      json_response['count'].should == 1
+      json_response['stock_locations'].first['name'].should eq expected_result.name
+    end
 
-      it "cannot delete a stock location" do
-        api_put :destroy, :id => stock_location.to_param
-        response.status.should == 401
-      end
+    it "gets a stock location" do
+      api_get :show, id: stock_location.to_param
+      json_response.should have_attributes(attributes)
+      json_response['name'].should eq stock_location.name
     end
 
-    
     context "as an admin" do
       sign_in_as_admin!
 
-      it "gets list of stock locations" do
-        api_get :index
-        json_response['stock_locations'].first.should have_attributes(attributes)
-        json_response['stock_locations'].first['country'].should_not be_nil
-        json_response['stock_locations'].first['state'].should_not be_nil
-      end
-
-      it 'can control the page size through a parameter' do
-        create(:stock_location)
-        api_get :index, per_page: 1
-        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(:stock_location, name: 'South America')
-        api_get :index, q: { name_cont: 'south' }
-        json_response['count'].should == 1
-        json_response['stock_locations'].first['name'].should eq expected_result.name
-      end
-
-      it "gets a stock location" do
-        api_get :show, id: stock_location.to_param
-        json_response.should have_attributes(attributes)
-        json_response['name'].should eq stock_location.name
-      end
-
       it "can create a new stock location" do
         params = {
           stock_location: {

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

@@ -13,65 +13,41 @@ module Spree
       stub_authentication!
     end
 
-    context 'as a user' do
-      it 'cannot see a list of stock movements' do
-        api_get :index, stock_location_id: stock_location.to_param
-        response.status.should == 401
-      end
+    it 'gets list of stock movements' do
+      api_get :index, stock_location_id: stock_location.to_param
+      json_response['stock_movements'].first.should have_attributes(attributes)
+      json_response['stock_movements'].first['stock_item']['count_on_hand'].should eq 11
+    end
 
-      it 'cannot see a stock movement' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.id
-        response.status.should == 401
-      end
+    it 'requires a stock_location_id to be passed as a parameter' do
+      api_get :index
+      json_response['error'].should =~ /stock_location_id parameter must be provided/
+      response.status.should == 422
+    end
 
-      it 'cannot create a stock movement' do
-        params = {
-          stock_location_id: stock_location.to_param,
-          stock_movement: {
-            stock_item_id: stock_item.to_param
-          }
-        }
+    it 'can control the page size through a parameter' do
+      create(:stock_movement, stock_item: stock_item)
+      api_get :index, stock_location_id: stock_location.to_param, per_page: 1
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 2
+    end
 
-        api_post :create, params
-        response.status.should == 401
-      end
+    it 'can query the results through a paramter' do
+      expected_result = create(:stock_movement, :received, quantity: 10, stock_item: stock_item)
+      api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
+      json_response['count'].should == 1
+    end
+
+    it 'gets a stock movement' do
+      api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.to_param
+      json_response.should have_attributes(attributes)
+      json_response['stock_item_id'].should eq stock_movement.stock_item_id
     end
 
     context 'as an admin' do
       sign_in_as_admin!
 
-      it 'gets list of stock movements' do
-        api_get :index, stock_location_id: stock_location.to_param
-        json_response['stock_movements'].first.should have_attributes(attributes)
-        json_response['stock_movements'].first['stock_item']['count_on_hand'].should eq 11
-      end
-
-      it 'requires a stock_location_id to be passed as a parameter' do
-        api_get :index
-        json_response['error'].should =~ /stock_location_id parameter must be provided/
-        response.status.should == 422
-      end
-
-      it 'can control the page size through a parameter' do
-        create(:stock_movement, stock_item: stock_item)
-        api_get :index, stock_location_id: stock_location.to_param, per_page: 1
-        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(:stock_movement, :received, quantity: 10, stock_item: stock_item)
-        api_get :index, stock_location_id: stock_location.to_param, q: { quantity_eq: '10' }
-        json_response['count'].should == 1
-      end
-
-      it 'gets a stock movement' do
-        api_get :show, stock_location_id: stock_location.to_param, id: stock_movement.to_param
-        json_response.should have_attributes(attributes)
-        json_response['stock_item_id'].should eq stock_movement.stock_item_id
-      end
-
       it 'can create a new stock movement' do
         params = {
           stock_location_id: stock_location.to_param,

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

@@ -7,7 +7,7 @@ module Spree
     let(:taxonomy) { create(:taxonomy) }
     let(:taxon) { create(:taxon, :name => "Ruby", :taxonomy => taxonomy) }
     let(:taxon2) { create(:taxon, :name => "Rails", :taxonomy => taxonomy) }
-    let(:attributes) { ["id", "name", "pretty_name", "permalink", "parent_id", "taxonomy_id"] }
+    let(:attributes) { ["id", "name", "pretty_name", "permalink", "position", "parent_id", "taxonomy_id"] }
 
     before do
       stub_authentication!
@@ -27,14 +27,6 @@ module Spree
         children.first['taxons'].count.should eq 1
       end
 
-      # Regression test for #4112
-      it "does not include children when asked not to" do
-        api_get :index, :taxonomy_id => taxonomy.id, :without_children => 1
-
-        json_response['taxons'].first['name'].should eq(taxon.name)
-        json_response['taxons'].first['taxons'].should be_nil
-      end
-
       it "paginates through taxons" do
         new_taxon = create(:taxon, :name => "Go", :taxonomy => taxonomy)
         taxonomy.root.children << new_taxon
@@ -47,42 +39,21 @@ module Spree
         expect(json_response["pages"]).to eql(2)
       end
 
-      describe 'searching' do
-        context 'with a name' do
-          before do
-            api_get :index, :q => { :name_cont => name }
-          end
-
-          context 'with one result' do
-            let(:name) { "Ruby" }
-
-            it "returns an array including the matching taxon" do
-              json_response['taxons'].count.should == 1
-              json_response['taxons'].first['name'].should eq "Ruby"
-            end
-          end
-
-          context 'with no results' do
-            let(:name) { "Imaginary" }
-
-            it 'returns an empty array of taxons' do
-              json_response.keys.should include('taxons')
-              json_response['taxons'].count.should == 0
-            end
-          end
-        end
-
-        context 'with no filters' do
-          it "gets all taxons" do
-            api_get :index
-
-            json_response['taxons'].first['name'].should eq taxonomy.root.name
-            children = json_response['taxons'].first['taxons']
-            children.count.should eq 1
-            children.first['name'].should eq taxon.name
-            children.first['taxons'].count.should eq 1
-          end
-        end
+      it "gets all taxons" do
+        api_get :index
+
+        json_response['taxons'].first['name'].should eq taxonomy.root.name
+        children = json_response['taxons'].first['taxons']
+        children.count.should eq 1
+        children.first['name'].should eq taxon.name
+        children.first['taxons'].count.should eq 1
+      end
+
+      it "can search for a single taxon" do
+        api_get :index, :q => { :name_cont => "Ruby" }
+
+        json_response['taxons'].count.should == 1
+        json_response['taxons'].first['name'].should eq "Ruby"
       end
 
       it "gets a single taxon" do
@@ -134,10 +105,9 @@ module Spree
         response.status.should == 201
 
         taxonomy.reload.root.children.count.should eq 2
-        taxon = Spree::Taxon.where(:name => 'Colors').first
 
-        taxon.parent_id.should eq taxonomy.root.id
-        taxon.taxonomy_id.should eq taxonomy.id
+        Spree::Taxon.last.parent_id.should eq taxonomy.root.id
+        Spree::Taxon.last.taxonomy_id.should eq taxonomy.id
       end
 
       it "cannot create a new taxon with invalid attributes" do

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

@@ -11,9 +11,7 @@ module Spree
     before { stub_authentication! }
 
     context "as a normal user" do
-      before do
-        controller.stub :current_api_user => user
-      end
+      before { Spree::LegacyUser.stub :find_by_spree_api_key => user }
 
       it "can get own details" do
         api_get :show, :id => user.id
@@ -24,7 +22,7 @@ module Spree
       it "cannot get other users details" do
         api_get :show, :id => stranger.id
 
-        assert_unauthorized!
+        assert_not_found!
       end
 
       it "can learn how to create a new user" do
@@ -52,7 +50,7 @@ module Spree
 
       it "cannot update other users details" do
         api_put :update, :id => stranger.id, :user => { :email => "mine@example.com" }
-        assert_unauthorized!
+        assert_not_found!
       end
 
       it "can delete itself" do
@@ -62,7 +60,7 @@ module Spree
 
       it "cannot delete other user" do
         api_delete :destroy, :id => stranger.id
-        assert_unauthorized!
+        assert_not_found!
       end
 
       it "should only get own details on index" do

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

@@ -4,7 +4,6 @@ module Spree
   describe Api::VariantsController do
     render_views
 
-
     let!(:product) { create(:product) }
     let!(:variant) do
       variant = product.master
@@ -13,7 +12,7 @@ module Spree
     end
     let!(:attributes) { [:id, :name, :sku, :price, :weight, :height,
                          :width, :depth, :is_master, :cost_price,
-                         :permalink] }
+                         :permalink, :description] }
 
     before do
       stub_authentication!
@@ -87,42 +86,27 @@ module Spree
       end
     end
 
-    context "single variant" do
-
-      it "can see a single variant" do
-        api_get :show, :id => variant.to_param
-        json_response.should have_attributes(attributes)
-        option_values = json_response["option_values"]
-        option_values.first.should have_attributes([:name,
-                                                    :presentation,
-                                                    :option_type_name,
-                                                    :option_type_id])
-      end
-
-      it "can see a single variant with images" do
-        variant.images.create!(:attachment => image("thinking-cat.jpg"))
-
-        api_get :show, :id => variant.to_param
-
-        json_response.should have_attributes(attributes + [:images])
-        option_values = json_response["option_values"]
-        option_values.first.should have_attributes([:name,
-                                                    :presentation,
-                                                    :option_type_name,
-                                                    :option_type_id])
-      end
-
-      it 'shows variant image urls' do
-        variant.images.create!(:attachment => image("thinking-cat.jpg"))
-
-        api_get :show, :id => variant.to_param
+    it "can see a single variant" do
+      api_get :show, :id => variant.to_param
+      json_response.should have_attributes(attributes)
+      option_values = json_response["option_values"]
+      option_values.first.should have_attributes([:name,
+                                                 :presentation,
+                                                 :option_type_name,
+                                                 :option_type_id])
+    end
 
-        images = json_response["images"]
-        image = images.first
+    it "can see a single variant with images" do
+      variant.images.create!(:attachment => image("thinking-cat.jpg"))
 
-        expect(image).to have_attributes [:mini_url, :small_url, :product_url, :large_url]
-      end
+      api_get :show, :id => variant.to_param
 
+      json_response.should have_attributes(attributes + [:images])
+      option_values = json_response["option_values"]
+      option_values.first.should have_attributes([:name,
+                                                 :presentation,
+                                                 :option_type_name,
+                                                 :option_type_id])
     end
 
     it "can learn how to create a new variant" do
@@ -138,12 +122,12 @@ module Spree
 
     it "cannot update a variant" do
       api_put :update, :id => variant.to_param, :variant => { :sku => "12345" }
-      assert_unauthorized!
+      assert_not_found!
     end
 
     it "cannot delete a variant" do
       api_delete :destroy, :id => variant.to_param
-      assert_unauthorized!
+      assert_not_found!
       lambda { variant.reload }.should_not raise_error
     end
 
@@ -184,6 +168,5 @@ module Spree
       end
     end
 
-
   end
 end

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

@@ -48,13 +48,13 @@ module Spree
       end
 
       it "uses the specified template" do
-        request.env['X-Spree-Template'] = 'show'
+        request.headers.env['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.env['X-Spree-Template'] = 'invoice'
+        request.headers.env['X-Spree-Template'] = 'invoice'
         api_get :show, :id => @zone.id
         response.should render_template('spree/api/zones/show')
       end