solidus_api 2.3.1 → 2.4.0.beta1

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

@@ -31,10 +31,9 @@ module Spree
     describe "POST create" do
       let(:target_user) { create :user }
       let(:date_override) { Time.parse('2015-01-01') }
-      let(:attributes) { { user_id: target_user.id, created_at: date_override, email: target_user.email } }
 
       subject do
-        post spree.api_orders_path, params: { order: attributes }
+        post spree.api_orders_path, params: { order: { user_id: target_user.id, created_at: date_override, email: target_user.email } }
         response
       end
 
@@ -45,37 +44,12 @@ module Spree
 
         it "does not include unpermitted params, or allow overriding the user" do
           subject
-          expect(response).to be_success
           order = Spree::Order.last
           expect(order.user).to eq current_api_user
           expect(order.email).to eq target_user.email
         end
 
         it { is_expected.to be_success }
-
-        context 'creating payment' do
-          let(:attributes) { super().merge(payments_attributes: [{ payment_method_id: payment_method.id }]) }
-
-          context "with allowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
-            it "creates a payment" do
-              expect {
-                subject
-              }.to change { Spree::Payment.count }.by(1)
-            end
-          end
-
-          context "with disallowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "forbidden", available_to_users: false) }
-            it { is_expected.to be_not_found }
-            it "creates no payments" do
-              expect {
-                subject
-              }.not_to change { Spree::Payment.count }
-            end
-          end
-        end
       end
 
       context "when the current user can administrate the order" do
@@ -95,7 +69,7 @@ module Spree
       end
 
       context 'when the line items have custom attributes' do
-        it "can create an order with line items that have custom permitted attributes", :pending do
+        it "can create an order with line items that have custom permitted attributes" do
           PermittedAttributes.line_item_attributes << { options: [:some_option] }
           expect_any_instance_of(Spree::LineItem).to receive(:some_option=).once.with('4')
           post spree.api_orders_path, params: { order: { line_items: { "0" => { variant_id: variant.to_param, quantity: 5, options: { some_option: 4 } } } } }
@@ -139,30 +113,6 @@ module Spree
             subject
           }.to_not change{ order.reload.number }
         end
-
-        context 'creating payment' do
-          let(:order_params) { super().merge(payments_attributes: [{ payment_method_id: payment_method.id }]) }
-
-          context "with allowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "allowed" ) }
-            it { is_expected.to be_success }
-            it "creates a payment" do
-              expect {
-                subject
-              }.to change { Spree::Payment.count }.by(1)
-            end
-          end
-
-          context "with disallowed payment method" do
-            let!(:payment_method) { create(:check_payment_method, name: "forbidden", available_to_users: false) }
-            it { is_expected.to be_not_found }
-            it "creates no payments" do
-              expect {
-                subject
-              }.not_to change { Spree::Payment.count }
-            end
-          end
-        end
       end
 
       context "when the user can administer the order" do
@@ -327,13 +277,6 @@ module Spree
       expect(json_response["checkout_steps"]).to eq(%w[address delivery confirm complete])
     end
 
-    # Regression test for https://github.com/spree/spree/issues/1992
-    it "can view an order not in a standard state" do
-      allow_any_instance_of(Order).to receive_messages user: current_api_user
-      order.update_column(:state, 'shipped')
-      get spree.api_order_path(order)
-    end
-
     it "can not view someone else's order" do
       allow_any_instance_of(Order).to receive_messages user: stub_model(Spree::LegacyUser)
       get spree.api_order_path(order)
@@ -394,7 +337,10 @@ module Spree
 
     # Regression test for https://github.com/spree/spree/issues/3404
     it "can specify additional parameters for a line item" do
-      expect_any_instance_of(Spree::LineItem).to receive(:special=).with("foo")
+      expect(Order).to receive(:create!).and_return(order = Spree::Order.new)
+      allow(order).to receive(:associate_user!)
+      allow(order).to receive_message_chain(:contents, :add).and_return(line_item = double('LineItem'))
+      expect(line_item).to receive(:update_attributes!).with(hash_including("special" => "foo"))
 
       allow_any_instance_of(Spree::Api::OrdersController).to receive_messages(permitted_line_item_attributes: [:id, :variant_id, :quantity, :special])
       post spree.api_orders_path, params: {
@@ -560,6 +506,7 @@ module Spree
 
       context "with a line item" do
         let(:order) { create(:order_with_line_items) }
+        let(:line_item) { order.line_items.first }
 
         it "can empty an order" do
           create(:adjustment, order: order, adjustable: order)

data/spec/requests/spree/api/payments_controller_spec.rb

@@ -42,17 +42,6 @@ module Spree
             expect(response.status).to eq(201)
             expect(json_response).to have_attributes(attributes)
           end
-
-          context "disallowed payment method" do
-            it "does not create a new payment" do
-              PaymentMethod.first.update!(available_to_users: false)
-
-              expect {
-                post spree.api_order_payments_path(order), params: { payment: { payment_method_id: PaymentMethod.first.id, amount: 50 } }
-              }.not_to change { Spree::Payment.count }
-              expect(response.status).to eq(404)
-            end
-          end
         end
 
         context "payment source is required" do

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

@@ -354,6 +354,21 @@ describe Spree::Api::ShipmentsController, type: :request do
         end
       end
 
+      context "for an unsuccessful transfer" do
+        before do
+          source_shipment
+          variant
+          stock_location.stock_items.update_all(backorderable: false)
+        end
+
+        it "returns the correct message" do
+          subject
+          expect(response).to be_accepted
+          expect(parsed_response["success"]).to be false
+          expect(parsed_response["message"]).to eq("Desired shipment not enough stock in desired stock location")
+        end
+      end
+
       context "if the source shipment can not be found" do
         let(:stock_location_id) { 9999 }
 
@@ -422,7 +437,7 @@ describe Spree::Api::ShipmentsController, type: :request do
 
         it "returns the correct message" do
           subject
-          expect(response).to be_success
+          expect(response).to be_accepted
           expect(parsed_response["success"]).to be true
           expect(parsed_response["message"]).to eq("Variants successfully transferred")
         end

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

@@ -27,6 +27,7 @@ module Spree
         create(:state)
         get spree.api_states_path, params: { page: 2, per_page: 1 }
 
+        expect(json_response).to be_paginated
         expect(json_response["states"].size).to eq(1)
         expect(json_response["pages"]).to eq(2)
         expect(json_response["current_page"]).to eq(2)

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

@@ -120,6 +120,31 @@ module Spree
         delete spree.api_taxonomy_taxon_path(taxonomy, taxon.id)
         assert_unauthorized!
       end
+
+      context "with caching enabled" do
+        let!(:product) { create(:product, taxons: [taxon]) }
+
+        before do
+          ActionController::Base.perform_caching = true
+        end
+
+        it "handles exclude_data correctly" do
+          get spree.api_taxon_products_path, params: { id: taxon.id, simple: true }
+          expect(response).to be_success
+          simple_response = json_response
+
+          get spree.api_taxon_products_path, params: { id: taxon.id }
+          expect(response).to be_success
+          full_response = json_response
+
+          expect(simple_response["products"][0]["description"]).to be_nil
+          expect(full_response["products"][0]["description"]).not_to be_nil
+        end
+
+        after do
+          ActionController::Base.perform_caching = false
+        end
+      end
     end
 
     context "as an admin" do

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

@@ -142,8 +142,8 @@ module Spree
       it "cannot destroy user with orders" do
         create(:completed_order_with_totals, user: user)
         delete spree.api_user_path(user)
-        expect(json_response["exception"]).to eq "Spree::Core::DestroyWithOrdersError"
         expect(response.status).to eq(422)
+        expect(json_response).to eq({ "error" => "Cannot delete record." })
       end
     end
   end

data/spec/support/be_paginated_matcher.rb

@@ -0,0 +1,7 @@
+RSpec::Matchers.define :be_paginated do
+  match do |actual|
+    %w[count total_count current_page pages per_page].all? do |attr|
+      actual[attr].is_a?(Integer)
+    end
+  end
+end

data/spec/test_views/spree/api/widgets/_widget.json.jbuilder

@@ -0,0 +1 @@
+json.(widget, :id, :name, :position)

data/spec/test_views/spree/api/widgets/index.json.jbuilder

@@ -0,0 +1,7 @@
+
+json.widgets(@collection) do |widget|
+  json.partial!("spree/api/widgets/widget", widget: widget)
+end
+json.count @collection.count
+json.current_page (params[:page] or 1)
+json.pages @collection.total_pages

data/spec/test_views/spree/api/widgets/new.json.jbuilder

@@ -0,0 +1 @@
+json.attributes [:name]

data/spec/test_views/spree/api/widgets/show.json.jbuilder

@@ -0,0 +1 @@
+json.partial!("spree/api/widgets/widget", widget: @object)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2017-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,42 +16,76 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 2.4.0.beta1
 - !ruby/object:Gem::Dependency
-  name: rabl
+  name: versioncake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: versioncake
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jbuilder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: kaminari
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -100,99 +134,116 @@ files:
 - app/controllers/spree/api/zones_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/api_configuration.rb
-- app/views/spree/api/address_books/show.v1.rabl
-- app/views/spree/api/addresses/show.v1.rabl
-- app/views/spree/api/adjustments/show.v1.rabl
-- app/views/spree/api/config/money.v1.rabl
-- app/views/spree/api/config/show.v1.rabl
-- app/views/spree/api/countries/index.v1.rabl
-- app/views/spree/api/countries/show.v1.rabl
-- app/views/spree/api/credit_cards/index.v1.rabl
-- app/views/spree/api/credit_cards/show.v1.rabl
-- app/views/spree/api/errors/gateway_error.v1.rabl
-- app/views/spree/api/errors/invalid_api_key.v1.rabl
-- app/views/spree/api/errors/invalid_resource.v1.rabl
-- app/views/spree/api/errors/must_specify_api_key.v1.rabl
-- app/views/spree/api/errors/not_found.v1.rabl
-- app/views/spree/api/errors/unauthorized.v1.rabl
-- app/views/spree/api/errors/variant_not_in_stock_transfer.v1.rabl
-- app/views/spree/api/images/index.v1.rabl
-- app/views/spree/api/images/show.v1.rabl
-- app/views/spree/api/inventory_units/show.rabl
-- app/views/spree/api/line_items/new.v1.rabl
-- app/views/spree/api/line_items/show.v1.rabl
-- app/views/spree/api/option_types/index.v1.rabl
-- app/views/spree/api/option_types/show.v1.rabl
-- app/views/spree/api/option_values/index.v1.rabl
-- app/views/spree/api/option_values/show.v1.rabl
-- app/views/spree/api/orders/could_not_apply_coupon.v1.rabl
-- app/views/spree/api/orders/could_not_transition.v1.rabl
-- app/views/spree/api/orders/expected_total_mismatch.v1.rabl
-- app/views/spree/api/orders/index.v1.rabl
-- app/views/spree/api/orders/invalid_shipping_method.v1.rabl
-- app/views/spree/api/orders/mine.v1.rabl
-- app/views/spree/api/orders/order.v1.rabl
-- app/views/spree/api/orders/show.v1.rabl
-- app/views/spree/api/payments/credit_over_limit.v1.rabl
-- app/views/spree/api/payments/index.v1.rabl
-- app/views/spree/api/payments/new.v1.rabl
-- app/views/spree/api/payments/show.v1.rabl
-- app/views/spree/api/payments/update_forbidden.v1.rabl
-- app/views/spree/api/product_properties/index.v1.rabl
-- app/views/spree/api/product_properties/new.v1.rabl
-- app/views/spree/api/product_properties/show.v1.rabl
-- app/views/spree/api/products/index.v1.rabl
-- 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/promotions/show.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
-- app/views/spree/api/return_authorizations/index.v1.rabl
-- app/views/spree/api/return_authorizations/new.v1.rabl
-- app/views/spree/api/return_authorizations/show.v1.rabl
-- app/views/spree/api/shipments/big.v1.rabl
-- app/views/spree/api/shipments/cannot_ready_shipment.v1.rabl
-- app/views/spree/api/shipments/mine.v1.rabl
-- app/views/spree/api/shipments/show.v1.rabl
-- app/views/spree/api/shipments/small.v1.rabl
-- app/views/spree/api/shipping_rates/show.v1.rabl
-- app/views/spree/api/states/index.v1.rabl
-- app/views/spree/api/states/show.v1.rabl
-- app/views/spree/api/stock_items/index.v1.rabl
-- app/views/spree/api/stock_items/show.v1.rabl
-- app/views/spree/api/stock_locations/index.v1.rabl
-- app/views/spree/api/stock_locations/show.v1.rabl
-- app/views/spree/api/stock_movements/index.v1.rabl
-- app/views/spree/api/stock_movements/show.v1.rabl
-- app/views/spree/api/stock_transfers/receive.v1.rabl
-- app/views/spree/api/store_credit_events/mine.v1.rabl
-- app/views/spree/api/stores/index.v1.rabl
-- app/views/spree/api/stores/show.v1.rabl
-- app/views/spree/api/taxonomies/index.v1.rabl
-- app/views/spree/api/taxonomies/jstree.rabl
-- app/views/spree/api/taxonomies/nested.v1.rabl
-- app/views/spree/api/taxonomies/new.v1.rabl
-- app/views/spree/api/taxonomies/show.v1.rabl
-- app/views/spree/api/taxons/index.v1.rabl
-- app/views/spree/api/taxons/jstree.rabl
-- app/views/spree/api/taxons/new.v1.rabl
-- app/views/spree/api/taxons/show.v1.rabl
-- app/views/spree/api/taxons/taxons.v1.rabl
-- app/views/spree/api/transfer_items/show.v1.rabl
-- 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.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/small.v1.rabl
-- app/views/spree/api/zones/index.v1.rabl
-- app/views/spree/api/zones/show.v1.rabl
-- config/initializers/rails5_rabl_hacks.rb
+- app/views/.rubocop.yml
+- app/views/spree/api/address_books/show.json.jbuilder
+- app/views/spree/api/addresses/_address.json.jbuilder
+- app/views/spree/api/addresses/show.json.jbuilder
+- app/views/spree/api/adjustments/_adjustment.json.jbuilder
+- app/views/spree/api/config/money.json.jbuilder
+- app/views/spree/api/config/show.json.jbuilder
+- app/views/spree/api/countries/index.json.jbuilder
+- app/views/spree/api/countries/show.json.jbuilder
+- app/views/spree/api/credit_cards/_credit_card.json.jbuilder
+- app/views/spree/api/credit_cards/index.json.jbuilder
+- app/views/spree/api/credit_cards/show.json.jbuilder
+- app/views/spree/api/errors/delete_restriction.json.jbuilder
+- app/views/spree/api/errors/gateway_error.json.jbuilder
+- app/views/spree/api/errors/invalid_api_key.json.jbuilder
+- app/views/spree/api/errors/invalid_resource.json.jbuilder
+- app/views/spree/api/errors/must_specify_api_key.json.jbuilder
+- app/views/spree/api/errors/not_found.json.jbuilder
+- app/views/spree/api/errors/unauthorized.json.jbuilder
+- app/views/spree/api/errors/variant_not_in_stock_transfer.json.jbuilder
+- app/views/spree/api/images/_image.json.jbuilder
+- app/views/spree/api/images/index.json.jbuilder
+- app/views/spree/api/images/show.json.jbuilder
+- app/views/spree/api/inventory_units/show.json.jbuilder
+- app/views/spree/api/line_items/_line_item.json.jbuilder
+- app/views/spree/api/line_items/new.json.jbuilder
+- app/views/spree/api/line_items/show.json.jbuilder
+- app/views/spree/api/option_types/_option_type.json.jbuilder
+- app/views/spree/api/option_types/index.json.jbuilder
+- app/views/spree/api/option_types/show.json.jbuilder
+- app/views/spree/api/option_values/_option_value.json.jbuilder
+- app/views/spree/api/option_values/index.json.jbuilder
+- app/views/spree/api/option_values/show.json.jbuilder
+- app/views/spree/api/orders/_big.json.jbuilder
+- app/views/spree/api/orders/_order.json.jbuilder
+- app/views/spree/api/orders/could_not_apply_coupon.json.jbuilder
+- app/views/spree/api/orders/could_not_transition.json.jbuilder
+- app/views/spree/api/orders/expected_total_mismatch.json.jbuilder
+- app/views/spree/api/orders/index.json.jbuilder
+- app/views/spree/api/orders/invalid_shipping_method.json.jbuilder
+- app/views/spree/api/orders/mine.json.jbuilder
+- app/views/spree/api/orders/show.json.jbuilder
+- app/views/spree/api/payments/credit_over_limit.json.jbuilder
+- app/views/spree/api/payments/index.json.jbuilder
+- app/views/spree/api/payments/new.json.jbuilder
+- app/views/spree/api/payments/show.json.jbuilder
+- app/views/spree/api/payments/update_forbidden.json.jbuilder
+- app/views/spree/api/product_properties/index.json.jbuilder
+- app/views/spree/api/product_properties/new.json.jbuilder
+- app/views/spree/api/product_properties/show.json.jbuilder
+- app/views/spree/api/products/_product.json.jbuilder
+- app/views/spree/api/products/index.json.jbuilder
+- app/views/spree/api/products/new.json.jbuilder
+- app/views/spree/api/products/show.json.jbuilder
+- app/views/spree/api/promotions/handler.json.jbuilder
+- app/views/spree/api/promotions/show.json.jbuilder
+- app/views/spree/api/properties/index.json.jbuilder
+- app/views/spree/api/properties/new.json.jbuilder
+- app/views/spree/api/properties/show.json.jbuilder
+- app/views/spree/api/return_authorizations/index.json.jbuilder
+- app/views/spree/api/return_authorizations/new.json.jbuilder
+- app/views/spree/api/return_authorizations/show.json.jbuilder
+- app/views/spree/api/shared/_pagination.json.jbuilder
+- app/views/spree/api/shipments/_big.json.jbuilder
+- app/views/spree/api/shipments/_small.json.jbuilder
+- app/views/spree/api/shipments/cannot_ready_shipment.json.jbuilder
+- app/views/spree/api/shipments/mine.json.jbuilder
+- app/views/spree/api/shipments/show.json.jbuilder
+- app/views/spree/api/shipping_rates/_shipping_rate.json.jbuilder
+- app/views/spree/api/states/index.json.jbuilder
+- app/views/spree/api/states/show.json.jbuilder
+- app/views/spree/api/stock_items/_stock_item.json.jbuilder
+- app/views/spree/api/stock_items/index.json.jbuilder
+- app/views/spree/api/stock_items/show.json.jbuilder
+- app/views/spree/api/stock_locations/_stock_location.json.jbuilder
+- app/views/spree/api/stock_locations/index.json.jbuilder
+- app/views/spree/api/stock_locations/show.json.jbuilder
+- app/views/spree/api/stock_movements/_stock_movement.json.jbuilder
+- app/views/spree/api/stock_movements/index.json.jbuilder
+- app/views/spree/api/stock_movements/show.json.jbuilder
+- app/views/spree/api/stock_transfers/receive.json.jbuilder
+- app/views/spree/api/store_credit_events/mine.json.jbuilder
+- app/views/spree/api/stores/index.json.jbuilder
+- app/views/spree/api/stores/show.json.jbuilder
+- app/views/spree/api/taxonomies/_nested.json.jbuilder
+- app/views/spree/api/taxonomies/_taxonomy.json.jbuilder
+- app/views/spree/api/taxonomies/index.json.jbuilder
+- app/views/spree/api/taxonomies/jstree.json.jbuilder
+- app/views/spree/api/taxonomies/new.json.jbuilder
+- app/views/spree/api/taxonomies/show.json.jbuilder
+- app/views/spree/api/taxons/_taxon.json.jbuilder
+- app/views/spree/api/taxons/_taxons.json.jbuilder
+- app/views/spree/api/taxons/index.json.jbuilder
+- app/views/spree/api/taxons/jstree.json.jbuilder
+- app/views/spree/api/taxons/new.json.jbuilder
+- app/views/spree/api/taxons/show.json.jbuilder
+- app/views/spree/api/transfer_items/_transfer_item.json.jbuilder
+- app/views/spree/api/transfer_items/show.json.jbuilder
+- app/views/spree/api/users/_user.json.jbuilder
+- app/views/spree/api/users/index.json.jbuilder
+- app/views/spree/api/users/new.json.jbuilder
+- app/views/spree/api/users/show.json.jbuilder
+- app/views/spree/api/variants/_big.json.jbuilder
+- app/views/spree/api/variants/_small.json.jbuilder
+- app/views/spree/api/variants/index.json.jbuilder
+- app/views/spree/api/variants/new.json.jbuilder
+- app/views/spree/api/variants/show.json.jbuilder
+- app/views/spree/api/zones/_zone.json.jbuilder
+- app/views/spree/api/zones/index.json.jbuilder
+- app/views/spree/api/zones/show.json.jbuilder
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
@@ -254,12 +305,14 @@ files:
 - spec/requests/spree/api/zones_controller_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
+- spec/support/be_paginated_matcher.rb
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
 - spec/support/have_attributes_matcher.rb
-- spec/test_views/spree/api/widgets/index.v1.rabl
-- spec/test_views/spree/api/widgets/new.v1.rabl
-- spec/test_views/spree/api/widgets/show.v1.rabl
+- spec/test_views/spree/api/widgets/_widget.json.jbuilder
+- spec/test_views/spree/api/widgets/index.json.jbuilder
+- spec/test_views/spree/api/widgets/new.json.jbuilder
+- spec/test_views/spree/api/widgets/show.json.jbuilder
 homepage: http://solidus.io/
 licenses:
 - BSD-3-Clause
@@ -329,9 +382,11 @@ test_files:
 - spec/requests/spree/api/zones_controller_spec.rb
 - spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
+- spec/support/be_paginated_matcher.rb
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
 - spec/support/have_attributes_matcher.rb
-- spec/test_views/spree/api/widgets/index.v1.rabl
-- spec/test_views/spree/api/widgets/new.v1.rabl
-- spec/test_views/spree/api/widgets/show.v1.rabl
+- spec/test_views/spree/api/widgets/_widget.json.jbuilder
+- spec/test_views/spree/api/widgets/index.json.jbuilder
+- spec/test_views/spree/api/widgets/new.json.jbuilder
+- spec/test_views/spree/api/widgets/show.json.jbuilder

data/app/views/spree/api/address_books/show.v1.rabl

@@ -1,7 +0,0 @@
-collection @user_addresses
-node do |user_address|
-  partial("spree/api/addresses/show", object: user_address.address).merge(
-    default: user_address.default,
-    update_target: @address == user_address.address,
-  )
-end

data/app/views/spree/api/addresses/show.v1.rabl

@@ -1,10 +0,0 @@
-object @address
-cache [I18n.locale, root_object]
-attributes *address_attributes
-
-child(:country) do |address|
-  attributes *country_attributes
-end
-child(:state) do |address|
-  attributes *state_attributes
-end

data/app/views/spree/api/adjustments/show.v1.rabl

@@ -1,4 +0,0 @@
-object @adjustment
-cache [I18n.locale, root_object]
-attributes *adjustment_attributes
-node(:display_amount) { |a| a.display_amount.to_s }

data/app/views/spree/api/config/money.v1.rabl

@@ -1,2 +0,0 @@
-object false
-node(:symbol) { ::Money.new(1, Spree::Config[:currency]).symbol }