spree_api 1.3.5 → 2.0.0.rc1

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

@@ -40,7 +40,7 @@ module Spree
       json_response['pages'].should == 2
     end
 
-    it 'can query the results through a paramter' do
+    it 'can query the results through a parameter' do
       Spree::ProductProperty.last.update_attribute(:value, 'loose')
       property = Spree::ProductProperty.last
       api_get :index, :q => { :value_cont => 'loose' }
@@ -91,7 +91,7 @@ module Spree
         response.status.should == 200
       end
 
-      it "can delete a variant" do
+      it "can delete a product property" do
         api_delete :destroy, :id => property_1.property_name
         response.status.should == 204
         lambda { property_1.reload }.should raise_error(ActiveRecord::RecordNotFound)

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

@@ -7,11 +7,7 @@ module Spree
 
     let!(:product) { create(:product) }
     let!(:inactive_product) { create(:product, :available_on => Time.now.tomorrow, :name => "inactive") }
-    let(:attributes) { [:id, :name, :description, :price, :available_on, :permalink, :count_on_hand, :meta_description, :meta_keywords, :taxon_ids] }
-    let(:product_hash) do
-      { :name => "The Other Product",
-        :price => 19.99 }
-    end
+    let(:attributes) { [:id, :name, :description, :price, :available_on, :permalink, :meta_description, :meta_keywords, :taxon_ids] }
 
     before do
       stub_authentication!
@@ -26,16 +22,30 @@ module Spree
         json_response["pages"].should == 1
       end
 
+      it "retrieves a list of products by id" do
+        api_get :index, :ids => [product.id]
+        json_response["products"].first.should have_attributes(attributes)
+        json_response["count"].should == 1
+        json_response["current_page"].should == 1
+        json_response["pages"].should == 1
+      end
+
+      it "does not return inactive products when queried by ids" do
+        api_get :index, :ids => [inactive_product.id]
+        json_response["count"].should == 0
+      end
+
       it "does not list unavailable products" do
         api_get :index
         json_response["products"].first["name"].should_not eq("inactive")
       end
 
       context "pagination" do
+        default_per_page(1)
 
         it "can select the next page of products" do
           second_product = create(:product)
-          api_get :index, :page => 2, :per_page => 1
+          api_get :index, :page => 2
           json_response["products"].first.should have_attributes(attributes)
           json_response["total_count"].should == 2
           json_response["current_page"].should == 2
@@ -76,7 +86,6 @@ module Spree
         json_response.should have_attributes(attributes)
         json_response['variants'].first.should have_attributes([:name,
                                                               :is_master,
-                                                              :count_on_hand,
                                                               :price,
                                                               :images])
 
@@ -161,79 +170,12 @@ module Spree
       end
 
       it "can create a new product" do
-        api_post :create, :product => product_hash
+        api_post :create, :product => { :name => "The Other Product",
+                                        :price => 19.99 }
         json_response.should have_attributes(attributes)
         response.status.should == 201
       end
 
-      describe "creating products with" do
-        it "embedded variants" do
-          def attributes_for_variant
-            h = attributes_for(:variant).except(:is_master, :product)
-            h.delete(:option_values)
-            h.merge({
-              options: [
-                { name: "size", value: "small" },
-                { name: "color", value: "black" }
-              ]
-            })
-          end
-
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            option_types: ['size', 'color'],
-
-            variants_attributes: [
-              attributes_for_variant,
-              attributes_for_variant
-            ]
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
-          expect(json_response['variants'][1]['option_values'][0]['name']).to eq('small')
-          expect(json_response['variants'][1]['option_values'][0]['option_type_name']).to eq('size')
-
-          expect(json_response['option_types'].count).to eq(2) # size, color
-        end
-
-        it "embedded product_properties" do
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            product_properties_attributes: [{
-              property_name: "fabric",
-              value: "cotton"
-            }]
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['product_properties'][0]['property_name']).to eq('fabric')
-          expect(json_response['product_properties'][0]['value']).to eq('cotton')
-        end
-
-        it "option_types even if without variants" do
-          attributes = product_hash
-
-          attributes.merge!({
-            shipping_category_id: 1,
-
-            option_types: ['size', 'color']
-          })
-
-          api_post :create, :product => attributes
-
-          expect(json_response['option_types'].count).to eq(2)
-        end
-      end
-
       # Regression test for #2140
       context "with authentication_required set to false" do
         before do

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

@@ -0,0 +1,89 @@
+require 'spec_helper'
+module Spree
+  describe Spree::Api::PropertiesController do
+    render_views
+
+    let!(:property_1) { Property.create!(:name => "foo", :presentation => "Foo") }
+    let!(:property_2) { Property.create!(:name => "bar", :presentation => "Bar") }
+
+    let(:attributes) { [:id, :name, :presentation] }
+
+    before do
+      stub_authentication!
+    end
+
+    it "can see a list of all properties" do
+      api_get :index
+      json_response["properties"].count.should eq(2)
+      json_response["properties"].first.should have_attributes(attributes)
+    end
+
+    it "can control the page size through a parameter" do
+      api_get :index, :per_page => 1
+      json_response['properties'].count.should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 2
+    end
+
+    it 'can query the results through a parameter' do
+      api_get :index, :q => { :name_cont => 'ba' }
+      json_response['count'].should == 1
+      json_response['properties'].first['presentation'].should eq property_2.presentation
+    end
+
+    it "can see a single property" do
+      api_get :show, :id => property_1.id
+      json_response.should have_attributes(attributes)
+    end
+
+    it "can see a property by name" do
+      api_get :show, :id => property_1.name
+      json_response.should have_attributes(attributes)
+    end
+
+    it "can learn how to create a new property" do
+      api_get :new
+      json_response["attributes"].should == attributes.map(&:to_s)
+      json_response["required_attributes"].should be_empty
+    end
+
+    it "cannot create a new property if not an admin" do
+      api_post :create, :property => { :name => "My Property 3" }
+      assert_unauthorized!
+    end
+
+    it "cannot update a property" do
+      api_put :update, :id => property_1.name, :property => { :presentation => "my value 456" }
+      assert_unauthorized!
+    end
+
+    it "cannot delete a property" do
+      api_delete :destroy, :id => property_1.id
+      assert_unauthorized!
+      lambda { property_1.reload }.should_not raise_error
+    end
+
+    context "as an admin" do
+      sign_in_as_admin!
+
+      it "can create a new property" do
+        Spree::Property.count.should == 2
+        api_post :create, :property => { :name => "My Property 3", :presentation => "my value 3" }
+        json_response.should have_attributes(attributes)
+        response.status.should == 201
+        Spree::Property.count.should == 3
+      end
+
+      it "can update a property" do
+        api_put :update, :id => property_1.name, :property => { :presentation => "my value 456" }
+        response.status.should == 200
+      end
+
+      it "can delete a property" do
+        api_delete :destroy, :id => property_1.name
+        response.status.should == 204
+        lambda { property_1.reload }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end

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

@@ -4,15 +4,7 @@ module Spree
   describe Api::ReturnAuthorizationsController do
     render_views
 
-    let!(:order) do
-     order = create(:order)
-     order.line_items << create(:line_item)
-     order.shipments << create(:shipment, :state => 'shipped')
-     order.finalize!
-     order.shipments.update_all(:state => 'shipped')
-     order.inventory_units.update_all(:state => 'shipped')
-     order
-    end
+    let!(:order) { create(:shipped_order) }
 
     let(:product) { create(:product) }
     let(:attributes) { [:id, :reason, :amount, :state] }

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::Api::ShipmentsController do
   render_views
   let!(:shipment) { create(:shipment) }
-  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at] }
+  let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at, :stock_location_name, :order_id, :shipping_rates, :shipping_method, :inventory_units] }
 
   before do
     stub_authentication!
@@ -24,8 +24,56 @@ describe Spree::Api::ShipmentsController do
   end
 
   context "as an admin" do
+    let!(:order) { shipment.order }
+    let!(:stock_location) { create(:stock_location_with_items) }
+    let!(:variant) { create(:variant) }
     sign_in_as_admin!
 
+    it 'can create a new shipment' do
+      params = {
+        variant_id: stock_location.stock_items.first.variant.to_param,
+        order_id: order.number,
+        stock_location_id: stock_location.to_param,
+      }
+
+      api_post :create, params
+      response.status.should == 200
+      json_response.should have_attributes(attributes)
+    end
+
+    it 'can update a shipment' do
+      params = {
+        shipment: {
+          stock_location_id: stock_location.to_param
+        }
+      }
+
+      api_put :update, params
+      response.status.should == 200
+      json_response['stock_location_name'].should == stock_location.name
+    end
+
+    it "can unlock a shipment's adjustment when updating" do
+      Spree::Calculator::FlatRate.any_instance.stub(:preferred_amount => 5)
+      adjustment = order.adjustments.create(amount: 1, label: 'shipping')
+      adjustment.source = shipment
+      adjustment.originator = shipment.shipping_method
+      adjustment.save!
+
+      params = {
+        order_id: order.number,
+        id: order.shipments.first.to_param,
+        shipment: {
+          unlock: 'yes'
+        }
+      }
+
+      api_put :update, params
+      response.status.should == 200
+      json_response.should have_attributes(attributes)
+      shipment.reload.adjustment.amount.should == 5
+    end
+
     it "can make a shipment ready" do
       Spree::Order.any_instance.stub(:paid? => true, :complete? => true)
       api_put :ready
@@ -41,17 +89,44 @@ describe Spree::Api::ShipmentsController do
       response.status.should == 422
     end
 
+    context 'for completed shipments' do
+      let(:order) { create :completed_order_with_totals }
+
+      let!(:resource_scoping) { { :order_id => order.to_param, :id => order.shipments.first.to_param } }
+
+      it 'can add a variant to a shipment' do
+        params = {
+          variant_id: variant.to_param,
+          quantity: 2
+        }
+        api_put :add, params
+        response.status.should == 200
+        json_response['inventory_units'].select { |h| h['variant_id'] == variant.id }.size.should == 2
+      end
+
+      it 'can remove a variant from a shipment' do
+        order.contents.add(variant, 2)
+
+        params = {
+          variant_id: variant.to_param,
+          quantity: 1
+        }
+
+        api_put :remove, params
+        response.status.should == 200
+        json_response['inventory_units'].select { |h| h['variant_id'] == variant.id }.size.should == 1
+     end
+    end
+
     context "can transition a shipment from ready to ship" do
       before do
         Spree::Order.any_instance.stub(:paid? => true, :complete? => true)
         # For the shipment notification email
-        Spree::MailMethod.create!(
-          :environment => Rails.env,
-          :preferred_mails_from => "spree@example.com"
-        )
+        Spree::Config[:mails_from] = "spree@example.com"
 
         shipment.update!(shipment.order)
         shipment.state.should == "ready"
+        Spree::ShippingRate.any_instance.stub(:cost => 5)
       end
 
       it "can transition a shipment from ready to ship" do

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

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+module Spree
+  describe Api::StatesController do
+    render_views
+
+    let!(:state) { create(:state, :name => "Victoria") }
+    let(:attributes) { [:id, :name, :abbr, :country_id] }
+
+    before do
+      stub_authentication!
+    end
+
+    it "gets all states" do
+      api_get :index
+      json_response["states"].first.should have_attributes(attributes)
+      json_response['states'].first['name'].should eq(state.name)
+    end
+
+    context "pagination" do
+      before do
+        State.should_receive(:scoped).and_return(@scope = stub)
+        @scope.stub_chain(:ransack, :result, :includes, :order).and_return(@scope)
+      end
+
+      it "does not paginate states results when asked not to do so" do
+        @scope.should_not_receive(:page)
+        @scope.should_not_receive(:per)
+        api_get :index
+      end
+
+      it "paginates when page parameter is passed through" do
+        @scope.should_receive(:page).with(1).and_return(@scope)
+        @scope.should_receive(:per).with(nil)
+        api_get :index, :page => 1
+      end
+
+      it "paginates when per_page parameter is passed through" do
+        @scope.should_receive(:page).with(nil).and_return(@scope)
+        @scope.should_receive(:per).with(25)
+        api_get :index, :per_page => 25
+      end
+    end
+
+
+    context "with two states" do
+      before { create(:state, :name => "New South Wales") }
+
+      it "gets all states for a country" do
+        country = create(:country, :states_required => true)
+        state.country = country 
+        state.save
+
+        api_get :index, :country_id => country.id
+        json_response["states"].first.should have_attributes(attributes)
+        json_response["states"].count.should == 1
+        json_response["states_required"] = true
+      end
+
+      it "can view all states" do
+        api_get :index
+        json_response["states"].first.should have_attributes(attributes)
+      end
+
+      it 'can query the results through a paramter' do
+        api_get :index, :q => { :name_cont => 'Vic' }
+        json_response['states'].first['name'].should eq("Victoria")
+      end
+    end
+
+    it "can view a state" do
+      api_get :show, :id => state.id
+      json_response.should have_attributes(attributes)
+    end
+  end
+end