spree_api 2.1.12 → 2.2.0

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

@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+module Spree::Api
+  describe OrdersController do
+    render_views
+
+    before do
+      stub_authentication!
+    end
+
+    context "with an available promotion" do
+      let!(:order) { create(:order_with_line_items, :line_items_count => 1) }
+      let!(:promotion) do 
+        promotion = Spree::Promotion.create(name: "10% off", code: "10off")
+        calculator = Spree::Calculator::FlatPercentItemTotal.create(preferred_flat_percent: "10")
+        action = Spree::Promotion::Actions::CreateItemAdjustments.create(calculator: calculator)
+        promotion.actions << action
+        promotion
+      end
+
+      it "can apply a coupon code to the order" do
+        order.total.should == 110.00
+        api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.token
+        response.status.should == 200
+        order.reload.total.should == 109.00
+        json_response["success"].should == "The coupon code was successfully applied to your order."
+        json_response["error"].should be_blank
+        json_response["successful"].should be_true
+      end
+
+      context "with an expired promotion" do
+        before do
+          promotion.starts_at = 2.weeks.ago
+          promotion.expires_at = 1.week.ago
+          promotion.save
+        end
+
+        it "fails to apply" do
+          api_put :apply_coupon_code, :id => order.to_param, :coupon_code => "10off", :order_token => order.token
+          response.status.should == 422
+          json_response["success"].should be_blank
+          json_response["error"].should == "The coupon code is expired"
+          json_response["successful"].should be_false
+        end
+      end
+    end
+  end
+end

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

@@ -52,28 +52,7 @@ describe Spree::Api::ShipmentsController do
       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

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

@@ -6,7 +6,7 @@ module Spree
     render_views
 
     let!(:product) { create(:product) }
-    let(:attributes) { [:id, :name, :description, :price, :available_on, :permalink, :meta_description, :meta_keywords, :taxon_ids] }
+    let(:attributes) { [:id, :name, :description, :price, :available_on, :slug, :meta_description, :meta_keywords, :taxon_ids] }
 
     context "without authentication" do
       before { Spree::Api::Config[:requires_authentication] = false }

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

@@ -12,7 +12,8 @@ module Spree
 
     context "as a normal user" do
       before do
-        controller.stub :try_spree_current_user => user
+        Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { user }
+        Spree::LegacyUser.stub :find_by_spree_api_key => user
       end
 
       it "can get own details" do
@@ -79,7 +80,7 @@ module Spree
       sign_in_as_admin!
 
       it "gets all users" do
-        Spree::LegacyUser.stub :find_by_spree_api_key => current_api_user
+        Spree::LegacyUser.stub(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
 
         2.times { create(:user) }
 

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

@@ -10,7 +10,10 @@ module Spree
       variant.option_values << create(:option_value)
       variant
     end
-    let!(:attributes) { Api::ApiHelpers.variant_attributes }
+
+    let!(:base_attributes) { Api::ApiHelpers.variant_attributes }
+    let!(:show_attributes) { base_attributes.dup.push(:in_stock, :display_price) }
+    let!(:new_attributes) { base_attributes }
 
     before do
       stub_authentication!
@@ -18,7 +21,9 @@ module Spree
 
     it "can see a paginated list of variants" do
       api_get :index
-      json_response["variants"].first.should have_attributes(attributes)
+      first_variant = json_response["variants"].first
+      first_variant.should have_attributes(show_attributes)
+      first_variant["stock_items"].should be_present
       json_response["count"].should == 1
       json_response["current_page"].should == 1
       json_response["pages"].should == 1
@@ -77,7 +82,7 @@ module Spree
       it "can select the next page of variants" do
         second_variant = create(:variant)
         api_get :index, :page => 2, :per_page => 1
-        json_response["variants"].first.should have_attributes(attributes)
+        json_response["variants"].first.should have_attributes(show_attributes)
         json_response["total_count"].should == 3
         json_response["current_page"].should == 2
         json_response["pages"].should == 3
@@ -86,7 +91,8 @@ module Spree
 
     it "can see a single variant" do
       api_get :show, :id => variant.to_param
-      json_response.should have_attributes(attributes)
+      json_response.should have_attributes(show_attributes)
+      json_response["stock_items"].should be_present
       option_values = json_response["option_values"]
       option_values.first.should have_attributes([:name,
                                                  :presentation,
@@ -99,7 +105,7 @@ module Spree
 
       api_get :show, :id => variant.to_param
 
-      json_response.should have_attributes(attributes + [:images])
+      json_response.should have_attributes(show_attributes + [:images])
       option_values = json_response["option_values"]
       option_values.first.should have_attributes([:name,
                                                  :presentation,
@@ -109,7 +115,7 @@ module Spree
 
     it "can learn how to create a new variant" do
       api_get :new
-      json_response["attributes"].should == attributes.map(&:to_s)
+      json_response["attributes"].should == new_attributes.map(&:to_s)
       json_response["required_attributes"].should be_empty
     end
 
@@ -147,7 +153,7 @@ module Spree
 
       it "can create a new variant" do
         api_post :create, :variant => { :sku => "12345" }
-        json_response.should have_attributes(attributes)
+        json_response.should have_attributes(new_attributes)
         response.status.should == 201
         json_response["sku"].should == "12345"
 

data/spec/models/spree/order_spec.rb

@@ -8,7 +8,7 @@ module Spree
 
     let(:user) { stub_model(LegacyUser, :email => 'fox@mudler.com') }
     let(:shipping_method) { create(:shipping_method) }
-    let(:payment_method) { create(:payment_method) }
+    let(:payment_method) { create(:check_payment_method) }
 
     let(:product) { product = Spree::Product.create(:name => 'Test',
                                            :sku => 'TEST-1',
@@ -206,7 +206,7 @@ module Spree
       end
     end
 
-    context "shippments" do
+    context "shipments" do
       let(:params) do
         { :shipments_attributes => [
             { :tracking => '123456789',
@@ -258,7 +258,7 @@ module Spree
           { label: 'Promotion Discount', amount: -3.00 }] }
 
       order = Order.build_from_api(user, params)
-      order.adjustments.all?(&:finalized?).should be_true
+      order.adjustments.all?(&:closed?).should be_true
       order.adjustments.first.label.should eq 'Shipping Discount'
       order.adjustments.first.amount.should eq -4.99
     end
@@ -297,30 +297,5 @@ module Spree
         expect(Order.count).to eq count
       end
     end
-
-    context "import param and tax adjustments" do
-      let!(:tax_rate) { create(:tax_rate, amount: 0.05, calculator: Calculator::DefaultTax.create) }
-      let(:other_variant) { create(:variant) }
-
-      let(:line_item_attributes) do
-        line_items.merge({ "1" => { :variant_id => other_variant.id, :quantity => 5 }})
-      end
-
-      before { Zone.stub default_tax: tax_rate.zone }
-
-      it "doesnt create any tax ajustments when importing order" do
-        params = { import: true, line_items_attributes: line_item_attributes }
-        expect {
-          Order.build_from_api(user, params)
-        }.not_to change { Adjustment.count }
-      end
-
-      it "does create tax adjustments if not importing order" do
-        params = { import: false, line_items_attributes: line_item_attributes }
-        expect {
-          Order.build_from_api(user, params)
-        }.to change { Adjustment.count }
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.2.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2014-02-26 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.1.12
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.12
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -67,6 +67,7 @@ files:
 - app/controllers/spree/api/addresses_controller.rb
 - app/controllers/spree/api/base_controller.rb
 - app/controllers/spree/api/checkouts_controller.rb
+- app/controllers/spree/api/classifications_controller.rb
 - app/controllers/spree/api/config_controller.rb
 - app/controllers/spree/api/countries_controller.rb
 - app/controllers/spree/api/images_controller.rb
@@ -119,7 +120,6 @@ files:
 - app/views/spree/api/option_values/index.v1.rabl
 - app/views/spree/api/option_values/show.v1.rabl
 - app/views/spree/api/orders/address.v1.rabl
-- app/views/spree/api/orders/apply_coupon_code.v1.rabl
 - app/views/spree/api/orders/canceled.v1.rabl
 - app/views/spree/api/orders/cart.v1.rabl
 - app/views/spree/api/orders/complete.v1.rabl
@@ -144,6 +144,7 @@ files:
 - app/views/spree/api/products/new.v1.rabl
 - app/views/spree/api/products/product.v1.rabl
 - app/views/spree/api/products/show.v1.rabl
+- app/views/spree/api/promotions/handler.v1.rabl
 - app/views/spree/api/properties/index.v1.rabl
 - app/views/spree/api/properties/new.v1.rabl
 - app/views/spree/api/properties/show.v1.rabl
@@ -175,11 +176,11 @@ files:
 - app/views/spree/api/users/index.v1.rabl
 - app/views/spree/api/users/new.v1.rabl
 - app/views/spree/api/users/show.v1.rabl
-- app/views/spree/api/variants/big_variant.v1.rabl
 - app/views/spree/api/variants/index.v1.rabl
 - app/views/spree/api/variants/new.v1.rabl
 - app/views/spree/api/variants/show.v1.rabl
 - app/views/spree/api/variants/variant.v1.rabl
+- app/views/spree/api/variants/variant_full.v1.rabl
 - app/views/spree/api/zones/index.v1.rabl
 - app/views/spree/api/zones/show.v1.rabl
 - config/initializers/metal_load_paths.rb
@@ -202,6 +203,7 @@ files:
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
+- spec/controllers/spree/api/classifications_controller_spec.rb
 - spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb
@@ -213,6 +215,7 @@ files:
 - spec/controllers/spree/api/payments_controller_spec.rb
 - spec/controllers/spree/api/product_properties_controller_spec.rb
 - spec/controllers/spree/api/products_controller_spec.rb
+- spec/controllers/spree/api/promotion_application_spec.rb
 - spec/controllers/spree/api/properties_controller_spec.rb
 - spec/controllers/spree/api/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb
@@ -254,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Spree's API
@@ -262,6 +265,7 @@ test_files:
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
+- spec/controllers/spree/api/classifications_controller_spec.rb
 - spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb
@@ -273,6 +277,7 @@ test_files:
 - spec/controllers/spree/api/payments_controller_spec.rb
 - spec/controllers/spree/api/product_properties_controller_spec.rb
 - spec/controllers/spree/api/products_controller_spec.rb
+- spec/controllers/spree/api/promotion_application_spec.rb
 - spec/controllers/spree/api/properties_controller_spec.rb
 - spec/controllers/spree/api/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/shipments_controller_spec.rb

data/app/views/spree/api/orders/apply_coupon_code.v1.rabl

@@ -1,7 +0,0 @@
-object @coupon_result
-
-# Mimic of eventual payload in Spree Core to keep contract the same when we upgrade.
-# https://github.com/spree/spree/blob/master/api/app/views/spree/api/promotions/handler.v1.rabl
-node(:success) { @coupon_result.success }
-node(:error) { @coupon_result.error }
-node(:successful) { @coupon_result.coupon_applied? }