spree_api 2.1.12 → 2.2.0

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'spree/promo/coupon_applicator'
 
 module Spree
   describe Api::CheckoutsController do
@@ -15,23 +14,13 @@ module Spree
       create(:stock_location)
 
       @shipping_method = create(:shipping_method, :zones => [country_zone])
-      @payment_method = create(:bogus_payment_method)
+      @payment_method = create(:credit_card_payment_method)
     end
 
     after do
       Spree::Config[:track_inventory_levels] = true
     end
 
-    context "GET 'show'" do
-      let(:order) { create(:order) }
-
-      it "redirects to Orders#show" do
-        api_get :show, :id => order.number
-        response.status.should == 301
-        response.should redirect_to("/api/orders/#{order.number}")
-      end
-    end
-
     context "POST 'create'" do
       it "creates a new order when no parameters are passed" do
         api_post :create
@@ -56,28 +45,12 @@ module Spree
         order
       end
 
+
       before(:each) do
         Order.any_instance.stub(:confirmation_required? => true)
         Order.any_instance.stub(:payment_required? => true)
       end
 
-      it 'should not allow users to change the price of line items' do
-        line_item = order.line_items.first
-        price_was = line_item.price
-        api_put(
-          :update,
-          id: order.to_param,
-          order_token: order.token,
-          order: {
-            line_items: {0 => {id: line_item.id, price: '0.1', quantity: '3'}}
-          }
-        )
-        response.status.should == 200
-        line_item.reload
-        expect(line_item.price).to eq price_was
-        expect(line_item.price).to_not eq 0.1
-      end
-
       it "should transition a recently created order from cart to address" do
         order.state.should eq "cart"
         order.email.should_not be_nil
@@ -174,7 +147,8 @@ module Spree
           "number" => "4111111111111111",
           "month" => 1.month.from_now.month,
           "year" => 1.month.from_now.year,
-          "verification_value" => "123"
+          "verification_value" => "123",
+          "name" => "Spree Commerce"
         }
 
         api_put :update, :id => order.to_param, :order_token => order.token,
@@ -189,8 +163,7 @@ module Spree
         order.update_column(:state, "payment")
         api_put :update, :id => order.to_param, :order_token => order.token,
           :order => { :payments_attributes => [{ :payment_method_id => @payment_method.id.to_s }],
-                      :payment_source => { @payment_method.id.to_s => { first_name: "Spree" } } }
-
+                      :payment_source => { @payment_method.id.to_s => { } } }
         response.status.should == 422
         cc_errors = json_response['errors']['payments.Credit Card']
         cc_errors.should include("Number can't be blank")
@@ -242,17 +215,11 @@ module Spree
       end
 
       it "can apply a coupon code to an order" do
-        order.update_column(:state, "payment")
-        Spree::Promo::CouponApplicator.should_receive(:new).with(order).and_call_original
-        Spree::Promo::CouponApplicator.any_instance.should_receive(:apply).and_return({:coupon_applied? => true})
-        api_put :update, :id => order.to_param, :order_token => order.token, :order => { :coupon_code => "foobar" }
-      end
+        pending "ensure that the order totals are properly updated, see frontend orders_controller or checkout_controller as example"
 
-      it "can apply a coupon code to an order" do
         order.update_column(:state, "payment")
-        Spree::Promo::CouponApplicator.should_receive(:new).with(order).and_call_original
-        coupon_result = { :coupon_applied? => true }
-        Spree::Promo::CouponApplicator.any_instance.should_receive(:apply).and_return(coupon_result)
+        PromotionHandler::Coupon.should_receive(:new).with(order).and_call_original
+        PromotionHandler::Coupon.any_instance.should_receive(:apply).and_return({:coupon_applied? => true})
         api_put :update, :id => order.to_param, :order_token => order.token, :order => { :coupon_code => "foobar" }
       end
     end

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

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Spree
+  describe Api::ClassificationsController do
+    let(:taxon) do
+      taxon = create(:taxon)
+      3.times do
+        product = create(:product)
+        product.taxons << taxon
+      end
+      taxon
+    end
+
+    before do
+      stub_authentication!
+    end
+
+    context "as a user" do
+      it "cannot change the order of a product" do
+        api_put :update, :taxon_id => taxon, :product_id => taxon.products.first, :position => 1
+        response.status.should == 401
+      end
+    end
+
+    context "as an admin" do
+      sign_in_as_admin!
+
+      it "can change the order a product" do
+        last_product = taxon.products.last
+        classification = taxon.classifications.find_by(:product_id => last_product.id)
+        classification.position.should == 3
+        api_put :update, :taxon_id => taxon, :product_id => last_product, :position => 0
+        response.status.should == 200
+        classification.reload.position.should == 1
+      end
+    end
+  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,7 +40,6 @@ 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
       end
 
@@ -60,15 +62,20 @@ module Spree
 
       it "can update a line item on the order" do
         line_item = order.line_items.first
-        api_put :update, :id => line_item.id, :line_item => { :quantity => 1000 }
+        api_put :update, :id => line_item.id, :line_item => { :quantity => 101 }
         response.status.should == 200
+        order.reload
+        order.total.should == 1050 # 50 original due to factory, + 1000 in this test
         json_response.should have_attributes(attributes)
+        json_response["quantity"].should == 101
       end
 
       it "can delete a line item on the order" do
         line_item = order.line_items.first
         api_delete :destroy, :id => line_item.id
         response.status.should == 204
+        order.reload
+        order.line_items.count.should == 4 # 5 original due to factory, - 1 in this test
         lambda { line_item.reload }.should raise_error(ActiveRecord::RecordNotFound)
       end
 
@@ -95,28 +102,10 @@ module Spree
           api_delete :destroy, :id => line_item.id
           expect(order.reload.shipments).to be_empty
         end
-
-        context "order is completed" do
-          before do
-            order.stub completed?: true
-            Order.stub find_by!: order
-          end
-
-          it "doesn't destroy shipments or restart checkout flow" do
-            expect(order.reload.shipments).not_to be_empty
-            api_post :create, :line_item => { :variant_id => product.master.to_param, :quantity => 1 }
-            expect(order.reload.shipments).not_to be_empty
-          end
-        end
       end
     end
 
     context "as just another user" do
-      before do
-        user = create(:user)
-        controller.stub :try_spree_current_user => user
-      end
-
       it "cannot add a new line item to the order" do
         api_post :create, :line_item => { :variant_id => product.master.to_param, :quantity => 1 }
         assert_unauthorized!

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

@@ -111,13 +111,6 @@ module Spree
           option_value.name.should == "Option Value"
         end
 
-        it "permits the correct attributes" do
-          controller.should_receive(:permitted_option_value_attributes)
-          api_put :update, :id => option_value.id, :option_value => {
-                            :name => ""
-                           }
-        end
-
         it "cannot update an option value with invalid attributes" do
           api_put :update, :id => option_value.id, :option_value => {
                             :name => ""

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'spree/testing_support/bar_ability'
 
 module Spree
   describe Api::OrdersController do
@@ -14,7 +13,7 @@ module Spree
                         :user_id, :created_at, :updated_at,
                         :completed_at, :payment_total, :shipment_state,
                         :payment_state, :email, :special_instructions,
-                        :total_quantity, :display_item_total, :currency] }
+                        :total_quantity, :display_item_total] }
 
     let(:address_params) { { :country_id => Country.first.id, :state_id => State.first.id } }
 
@@ -26,7 +25,7 @@ module Spree
                                :city => "Sao Paulo", :zipcode => "1234567", :phone => "12345678",
                                :country_id => Country.first.id, :state_id => State.first.id} }
 
-    let!(:payment_method) { create(:payment_method) }
+    let!(:payment_method) { create(:check_payment_method) }
 
     let(:current_api_user) do
       user = Spree.user_class.new(:email => "spree@example.com")
@@ -117,20 +116,6 @@ module Spree
       response.status.should == 200
     end
 
-    context "with BarAbility registered" do
-      before { Spree::Ability.register_ability(::BarAbility) }
-      after { Spree::Ability.remove_ability(::BarAbility) }
-
-      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
-        api_get :show, :id => order.to_param
-        response.status.should == 200
-      end
-    end
-
     it "cannot cancel an order that doesn't belong to them" do
       order.update_attribute(:completed_at, Time.now)
       order.update_attribute(:shipment_state, "ready")
@@ -188,45 +173,13 @@ module Spree
       expect(Order.last.line_items.first.price.to_f).to eq(variant.price)
     end
 
-    context "import" do
-      let(:tax_rate) { create(:tax_rate, amount: 0.05, calculator: Calculator::DefaultTax.create) }
-      let(:other_variant) { create(:variant) }
-
-      let(:order_params) do
-        {
-          :line_items => {
-            "0" => { :variant_id => variant.to_param, :quantity => 5 },
-            "1" => { :variant_id => other_variant.to_param, :quantity => 5 }
-          }
-        }
-      end
-
-      before do
-        Zone.stub default_tax: tax_rate.zone
-        current_api_user.stub has_spree_role?: true
-      end
+    context "admin user imports order" do
+      before { current_api_user.stub has_spree_role?: true }
 
       it "sets channel" do
         api_post :create, :order => { channel: "amazon" }
         expect(json_response['channel']).to eq "amazon"
       end
-
-      it "doesnt persist any automatic tax adjustment" do
-        expect {
-          api_post :create, :order => order_params.merge(:import => true)
-        }.not_to change { Adjustment.count }
-
-        expect(response.status).to eq 201
-      end
-
-      it "doesnt blow up when passing a sku into line items hash" do
-        order_params[:line_items]["0"][:sku] = variant.sku
-        order_params[:line_items]["0"][:variant_id] = nil
-        order_params[:line_items]["1"][:sku] = other_variant.sku
-
-        api_post :create, :order => order_params
-        expect(response.status).to eq 201
-      end
     end
 
     # Regression test for #3404
@@ -255,7 +208,7 @@ module Spree
 
       let(:variant) { create(:variant) }
       let!(:line_item) { order.contents.add(variant, 1) }
-      let!(:payment_method) { create(:payment_method) }
+      let!(:payment_method) { create(:check_payment_method) }
 
       let(:address_params) { { :country_id => Country.first.id, :state_id => State.first.id } }
       let(:billing_address) { { :firstname => "Tiago", :lastname => "Motta", :address1 => "Av Paulista",
@@ -413,8 +366,23 @@ module Spree
         it "includes the tax_total in the response" do
           api_get :show, :id => order.to_param
 
-          json_response['tax_total'].should == '0.0'
-          json_response['display_tax_total'].should == '$0.00'
+          json_response['included_tax_total'].should == '0.0'
+          json_response['additional_tax_total'].should == '0.0'
+          json_response['display_included_tax_total'].should == '$0.00'
+          json_response['display_additional_tax_total'].should == '$0.00'
+        end
+
+        it "lists line item adjustments" do
+          adjustment = create(:adjustment,
+            :label => "10% off!",
+            :order => order,
+            :adjustable => order.line_items.first)
+          adjustment.update_column(:amount, 5)
+          api_get :show, :id => order.to_param
+
+          adjustment = json_response['line_items'].first['adjustments'].first
+          adjustment['label'].should == "10% off!"
+          adjustment['amount'].should == "5.0"
         end
 
         context "when in delivery" do
@@ -434,8 +402,8 @@ module Spree
           it "includes the ship_total in the response" do
             api_get :show, :id => order.to_param
 
-            json_response['ship_total'].should == '10.0'
-            json_response['display_ship_total'].should == '$10.00'
+            json_response['ship_total'].should == '0.0'
+            json_response['display_ship_total'].should == '$0.00'
           end
 
           it "returns available shipments for an order" do
@@ -564,71 +532,6 @@ module Spree
         end
       end
     end
-
-    describe 'apply_promo_code' do
-      # Borrowed from:
-      # https://github.com/spree/spree/blob/master/api/spec/controllers/spree/api/promotion_application_spec.rb
-
-      let(:order) do
-        order = create(
-          :order_with_line_items,
-          state: 'payment',
-          user: current_api_user,
-          line_items_count: 1
-        )
-      end
-
-      subject do
-        api_put :apply_coupon_code, id: order.to_param, coupon_code: coupon_code, :order_token => order.token
-      end
-
-      context 'when valid promo code' do
-        let(:coupon_code) { 'some_code' }
-
-        # Create a promotion for testing.
-        # https://github.com/spree/spree/blob/2-1-stable/core/spec/lib/spree/promo/coupon_applicator_spec.rb
-        before(:each) do
-          flat_percent_calc = Spree::Calculator::FlatPercentItemTotal.create(:preferred_flat_percent => "10")
-          promo = Spree::Promotion.create(:name => "Discount", :event_name => "spree.checkout.coupon_code_added", :code => coupon_code, :usage_limit => "10", :starts_at => DateTime.yesterday, :expires_at => DateTime.tomorrow)
-          promo_rule = Spree::Promotion::Rules::ItemTotal.create(:preferred_operator => "gt", :preferred_amount => "1")
-          promo_rule.update_attribute(:activator_id, promo.id)
-          promo_action = Spree::Promotion::Actions::CreateAdjustment.create(:calculator_type => "Spree::Calculator::FlatPercentItemTotal")
-          promo_action.update_attribute(:activator_id, promo.id)
-          flat_percent_calc.update_attribute(:calculable_id, promo.id)
-          Spree::Order.any_instance.stub(:payment_required? => false)
-          Spree::Adjustment.any_instance.stub(:eligible => true)
-        end
-
-        it 'should should be_ok' do
-          subject
-          response.should be_ok 
-        end
-
-        it 'should have success JSON' do
-          subject
-          result = JSON.parse(response.body)
-          result['successful'].should be_true
-          result['success'].should == "The coupon code was successfully applied to your order."
-          result['error'].should be_nil
-        end
-      end
-
-      context 'when invalid promo code' do
-        let(:coupon_code) { 'xxxxx' }
-        it 'should should be_ok ' do
-          subject
-          response.code.to_i.should == 422
-        end
-
-        it 'should have error JSON' do
-          subject
-          result = JSON.parse(response.body)
-          result['successful'].should be_false
-          result['error'].should == "The coupon code you entered doesn't exist. Please try again."
-          result['success'].should be_nil
-        end
-      end
-    end
   end
 end
 

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

@@ -7,7 +7,10 @@ module Spree
 
     let!(:product) { create(:product) }
     let!(:inactive_product) { create(:product, :available_on => Time.now.tomorrow, :name => "inactive") }
-    let(:attributes) { [:id, :name, :description, :price, :display_price, :available_on, :permalink, :meta_description, :meta_keywords, :shipping_category_id, :taxon_ids] }
+    let(:base_attributes) { [:id, :name, :description, :price, :display_price, :available_on, :slug, :meta_description, :meta_keywords, :shipping_category_id, :taxon_ids] }
+    let(:show_attributes) { base_attributes.dup.push(:has_variants) }
+    let(:new_attributes) { base_attributes }
+
     let(:product_data) do
       { name: "The Other Product",
         price: 19.99,
@@ -28,27 +31,9 @@ module Spree
     end
 
     context "as a normal user" do
-      context "with caching enabled" do
-        let!(:product_2) { create(:product) }
-
-        before do
-          ActionController::Base.perform_caching = true
-        end
-
-        it "returns unique products" do
-          api_get :index
-          product_ids = json_response["products"].map { |p| p["id"] }
-          expect(product_ids.uniq.count).to eq(product_ids.count)
-        end
-
-        after do
-          ActionController::Base.perform_caching = false
-        end
-      end
-
       it "retrieves a list of products" do
         api_get :index
-        json_response["products"].first.should have_attributes(attributes)
+        json_response["products"].first.should have_attributes(show_attributes)
         json_response["total_count"].should == 1
         json_response["current_page"].should == 1
         json_response["pages"].should == 1
@@ -57,7 +42,7 @@ module Spree
 
       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["products"].first.should have_attributes(show_attributes)
         json_response["total_count"].should == 1
         json_response["current_page"].should == 1
         json_response["pages"].should == 1
@@ -76,8 +61,8 @@ module Spree
       it "retrieves a list of products by ids string" do
         second_product = create(:product)
         api_get :index, :ids => [product.id, second_product.id].join(",")
-        json_response["products"].first.should have_attributes(attributes)
-        json_response["products"][1].should have_attributes(attributes)
+        json_response["products"].first.should have_attributes(show_attributes)
+        json_response["products"][1].should have_attributes(show_attributes)
         json_response["total_count"].should == 2
         json_response["current_page"].should == 1
         json_response["pages"].should == 1
@@ -98,7 +83,7 @@ module Spree
         it "can select the next page of products" do
           second_product = create(:product)
           api_get :index, :page => 2, :per_page => 1
-          json_response["products"].first.should have_attributes(attributes)
+          json_response["products"].first.should have_attributes(show_attributes)
           json_response["total_count"].should == 2
           json_response["current_page"].should == 2
           json_response["pages"].should == 2
@@ -132,7 +117,7 @@ module Spree
       it "can search for products" do
         create(:product, :name => "The best product in the world")
         api_get :index, :q => { :name_cont => "best" }
-        json_response["products"].first.should have_attributes(attributes)
+        json_response["products"].first.should have_attributes(show_attributes)
         json_response["count"].should == 1
       end
 
@@ -142,11 +127,12 @@ module Spree
         product.variants.first.images.create!(:attachment => image("thinking-cat.jpg"))
         product.set_property("spree", "rocks")
         api_get :show, :id => product.to_param
-        json_response.should have_attributes(attributes)
+        json_response.should have_attributes(show_attributes)
         json_response['variants'].first.should have_attributes([:name,
                                                               :is_master,
                                                               :price,
-                                                              :images])
+                                                              :images,
+                                                              :in_stock])
 
         json_response['variants'].first['images'].first.should have_attributes([:attachment_file_name,
                                                                                 :attachment_width,
@@ -163,20 +149,20 @@ module Spree
       end
 
 
-      context "finds a product by permalink first then by id" do
-        let!(:other_product) { create(:product, :permalink => "these-are-not-the-droids-you-are-looking-for") }
+      context "finds a product by slug first then by id" do
+        let!(:other_product) { create(:product, :slug => "these-are-not-the-droids-you-are-looking-for") }
 
         before do
-          product.update_attribute(:permalink, "#{other_product.id}-and-1-ways")
+          product.update_column(:slug, "#{other_product.id}-and-1-ways")
         end
 
         specify do
           api_get :show, :id => product.to_param
-          json_response["permalink"].should =~ /and-1-ways/
+          json_response["slug"].should =~ /and-1-ways/
           product.destroy
 
           api_get :show, :id => other_product.id
-          json_response["permalink"].should =~ /droids/
+          json_response["slug"].should =~ /droids/
         end
       end
 
@@ -192,7 +178,7 @@ module Spree
 
       it "can learn how to create a new product" do
         api_get :new
-        json_response["attributes"].should == attributes.map(&:to_s)
+        json_response["attributes"].should == new_attributes.map(&:to_s)
         required_attributes = json_response["required_attributes"]
         required_attributes.should include("name")
         required_attributes.should include("price")
@@ -238,7 +224,7 @@ module Spree
           api_post :create, :product => { :name => "The Other Product",
                                           :price => 19.99,
                                           :shipping_category_id => create(:shipping_category).id }
-          json_response.should have_attributes(attributes)
+          json_response.should have_attributes(base_attributes)
           response.status.should == 201
         end
 
@@ -249,9 +235,9 @@ module Spree
 
           api_post :create, :product => product_data
           expect(response.status).to eq 201
-          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
 
-          variants = json_response['variants'].select { |v| !v['is_master'] }
+          variants = json_response['variants']
+          expect(variants.count).to eq(2)
           expect(variants.last['option_values'][0]['name']).to eq('small')
           expect(variants.last['option_values'][0]['option_type_name']).to eq('size')
 
@@ -281,14 +267,6 @@ module Spree
           expect(json_response['option_types'].count).to eq(2)
         end
 
-        it "can create a new product" do
-          api_post :create, :product => { :name => "The Other Product",
-                                          :price => 19.99,
-                                          :shipping_category_id => create(:shipping_category).id }
-          json_response.should have_attributes(attributes)
-          response.status.should == 201
-        end
-
         it "creates with shipping categories" do
           hash = { :name => "The Other Product",
                    :price => 19.99,
@@ -326,7 +304,7 @@ module Spree
 
           it "can still create a product" do
             api_post :create, :product => product_data, :token => "fake"
-            json_response.should have_attributes(attributes)
+            json_response.should have_attributes(show_attributes)
             response.status.should == 201
           end
         end
@@ -336,7 +314,7 @@ module Spree
           response.status.should == 422
           json_response["error"].should == "Invalid resource. Please fix errors and try again."
           errors = json_response["errors"]
-          errors.delete("permalink") # Don't care about this one.
+          errors.delete("slug") # Don't care about this one.
           errors.keys.should =~ ["name", "price", "shipping_category_id"]
         end
       end
@@ -355,7 +333,7 @@ module Spree
         it "can create new variants on a product" do
           api_put :update, :id => product.to_param, :product => { :variants => [attributes_for_variant, attributes_for_variant] }
           expect(response.status).to eq 200
-          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
+          expect(json_response['variants'].count).to eq(2) # 2 variants
 
           variants = json_response['variants'].select { |v| !v['is_master'] }
           expect(variants.last['option_values'][0]['name']).to eq('small')
@@ -380,7 +358,7 @@ module Spree
             ]
           }
 
-          expect(json_response['variants'].count).to eq(2) # 1 master + 1 variants
+          expect(json_response['variants'].count).to eq(1)
           variants = json_response['variants'].select { |v| !v['is_master'] }
           expect(variants.last['option_values'][0]['name']).to eq('large')
           expect(variants.last['sku']).to eq('456')