solidus_api 1.2.3 → 1.3.0.beta1

data/spec/requests/api/address_books_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::AddressBooksController, :type => :request do
+  describe Api::AddressBooksController, type: :request do
     let!(:state) { create(:state) }
     let!(:harry_address_attributes) do
       {
@@ -38,14 +38,14 @@ module Spree
           user.save_in_address_book(harry_address_attributes, true)
           user.save_in_address_book(ron_address_attributes, false)
 
-          get "/api/users/#{user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon'}
+          get "/api/users/#{user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
           expect(json_response.length).to eq(2)
           expect(json_response).to include(
-              hash_including(harry_address_attributes.merge!('default' => true)),
-              hash_including(ron_address_attributes.merge!('default' => false)),
+            hash_including(harry_address_attributes.merge!('default' => true)),
+              hash_including(ron_address_attributes.merge!('default' => false))
             )
         end
 
@@ -99,7 +99,7 @@ module Spree
           user.save_in_address_book(address.attributes, false)
 
           expect {
-            delete "/api/users/#{user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon'}
+            delete "/api/users/#{user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -121,14 +121,14 @@ module Spree
           other_user.save_in_address_book(harry_address_attributes, true)
           other_user.save_in_address_book(ron_address_attributes, false)
 
-          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon'}
+          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
 
           json_response = JSON.parse(response.body)
           expect(response.status).to eq(200)
           expect(json_response.length).to eq(2)
           expect(json_response).to include(
-              hash_including(harry_address_attributes.merge!('default' => true)),
-              hash_including(ron_address_attributes.merge!('default' => false)),
+            hash_including(harry_address_attributes.merge!('default' => true)),
+              hash_including(ron_address_attributes.merge!('default' => false))
             )
         end
 
@@ -151,7 +151,7 @@ module Spree
           other_user.save_in_address_book(address.attributes, false)
 
           expect {
-            delete "/api/users/#{other_user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon'}
+            delete "/api/users/#{other_user.id}/address_book", { address_id: address.id }, { 'X-SPREE-TOKEN' => 'galleon' }
           }.to change { other_user.reload.user_addresses.count }.from(1).to(0)
 
           expect(response.status).to eq(200)
@@ -164,7 +164,7 @@ module Spree
           other_user = create(:user)
           other_user.save_in_address_book(harry_address_attributes, true)
 
-          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon'}
+          get "/api/users/#{other_user.id}/address_book", nil, { 'X-SPREE-TOKEN' => 'galleon' }
 
           expect(response.status).to eq(401)
         end
@@ -197,7 +197,6 @@ module Spree
       end
     end
 
-
     context 'unauthenticated' do
       before do
         @user = create(:user)

data/spec/requests/rabl_cache_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
-describe "Rabl Cache", :type => :request, :caching => true do
+describe "Rabl Cache", type: :request, caching: true do
   let!(:user)  { create(:admin_user) }
 
   before do
-    create(:variant) 
+    create(:variant)
     user.generate_spree_api_key!
     expect(Spree::Product.count).to eq(1)
   end
-  
+
   it "doesn't create a cache key collision for models with different rabl templates" do
-    get "/api/variants", :token => user.spree_api_key
+    get "/api/variants", token: user.spree_api_key
     expect(response.status).to eq(200)
 
     # Make sure we get a non master variant
-    variant_a = JSON.parse(response.body)['variants'].select do |v|
+    variant_a = JSON.parse(response.body)['variants'].find do |v|
       !v['is_master']
-    end.first
+    end
 
     expect(variant_a['is_master']).to be false
     expect(variant_a['stock_items']).not_to be_nil
 
-    get "/api/products/#{Spree::Product.first.id}", :token => user.spree_api_key
+    get "/api/products/#{Spree::Product.first.id}", token: user.spree_api_key
     expect(response.status).to eq(200)
     variant_b = JSON.parse(response.body)['variants'].last
     expect(variant_b['is_master']).to be false

data/spec/requests/ransackable_attributes_spec.rb

@@ -33,7 +33,7 @@ describe "Ransackable Attributes" do
 
       get "/api/variants?q[product_name_or_sku_cont]=fritos", token: user.spree_api_key
 
-      skus = JSON.parse(response.body)['variants'].map { |variant| variant['sku'] }
+      skus = JSON.parse(response.body)['variants'].map { |x| x['sku'] }
       expect(skus).to include variant.sku
       expect(skus).not_to include other_variant.sku
     end
@@ -41,8 +41,8 @@ describe "Ransackable Attributes" do
 
   context "filtering by attributes" do
     it "most attributes are not filterable by default" do
-      product = create(:product, description: "special product")
-      other_product = create(:product)
+      create(:product, description: "special product")
+      create(:product)
 
       get "/api/products?q[description_cont]=special", token: user.spree_api_key
 
@@ -56,7 +56,7 @@ describe "Ransackable Attributes" do
 
       get "/api/products?q[id_eq]=#{product.id}", token: user.spree_api_key
 
-      product_names = JSON.parse(response.body)['products'].map { |product| product['name'] }
+      product_names = JSON.parse(response.body)['products'].map { |x| x['name'] }
       expect(product_names).to include product.name
       expect(product_names).not_to include other_product.name
     end
@@ -69,11 +69,9 @@ describe "Ransackable Attributes" do
 
       get "/api/products?q[name_cont]=fritos", token: user.spree_api_key
 
-      product_names = JSON.parse(response.body)['products'].map { |product| product['name'] }
+      product_names = JSON.parse(response.body)['products'].map { |x| x['name'] }
       expect(product_names).to include product.name
       expect(product_names).not_to include other_product.name
     end
   end
-
-
 end

data/spec/shared_examples/protect_product_actions.rb

@@ -1,17 +1,16 @@
 shared_examples "modifying product actions are restricted" do
   it "cannot create a new product if not an admin" do
-    api_post :create, :product => { :name => "Brand new product!" }
+    api_post :create, product: { name: "Brand new product!" }
     assert_unauthorized!
   end
 
   it "cannot update a product" do
-    api_put :update, :id => product.to_param, :product => { :name => "I hacked your store!" }
+    api_put :update, id: product.to_param, product: { name: "I hacked your store!" }
     assert_unauthorized!
   end
 
   it "cannot delete a product" do
-    api_delete :destroy, :id => product.to_param
+    api_delete :destroy, id: product.to_param
     assert_unauthorized!
   end
 end
-

data/spec/spec_helper.rb

@@ -26,11 +26,10 @@ require 'ffaker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
+Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
 require 'spree/testing_support/factories'
 require 'spree/testing_support/preferences'
-require 'spree/testing_support/authorization_helpers'
 
 require 'spree/api/testing_support/caching'
 require 'spree/api/testing_support/helpers'
@@ -48,8 +47,8 @@ RSpec.configure do |config|
   end
 
   config.include FactoryGirl::Syntax::Methods
-  config.include Spree::Api::TestingSupport::Helpers, :type => :controller
-  config.extend Spree::Api::TestingSupport::Setup, :type => :controller
+  config.include Spree::Api::TestingSupport::Helpers, type: :controller
+  config.extend Spree::Api::TestingSupport::Setup, type: :controller
   config.include Spree::TestingSupport::Preferences
 
   config.extend WithModel
@@ -62,6 +61,11 @@ RSpec.configure do |config|
     Spree::Api::Config[:requires_authentication] = true
   end
 
+  config.include VersionCake::TestHelpers, type: :controller
+  config.before(:each, type: :controller) do
+    set_request_version('', 1)
+  end
+
   config.use_transactional_fixtures = true
 
   config.example_status_persistence_file_path = "./spec/examples.txt"

data/spec/support/controller_hacks.rb

@@ -7,23 +7,23 @@ module ControllerHacks
     routes { Spree::Core::Engine.routes }
   end
 
-  def api_get(action, params={}, session=nil, flash=nil)
+  def api_get(action, params = {}, session = nil, flash = nil)
     api_process(action, params, session, flash, "GET")
   end
 
-  def api_post(action, params={}, session=nil, flash=nil)
+  def api_post(action, params = {}, session = nil, flash = nil)
     api_process(action, params, session, flash, "POST")
   end
 
-  def api_put(action, params={}, session=nil, flash=nil)
+  def api_put(action, params = {}, session = nil, flash = nil)
     api_process(action, params, session, flash, "PUT")
   end
 
-  def api_delete(action, params={}, session=nil, flash=nil)
+  def api_delete(action, params = {}, session = nil, flash = nil)
     api_process(action, params, session, flash, "DELETE")
   end
 
-  def api_process(action, params={}, session=nil, flash=nil, method="get")
+  def api_process(action, params = {}, session = nil, flash = nil, method = "get")
     scoping = respond_to?(:resource_scoping) ? resource_scoping : {}
     process(action, method, params.merge(scoping).reverse_merge!(format: :json), session, flash)
   end

data/spec/support/have_attributes_matcher.rb

@@ -1,7 +1,4 @@
 
-
-
-
 RSpec::Matchers.define :have_attributes do |expected_attributes|
   match do |actual|
     # actual is a Hash object representing an object, like this:
@@ -10,4 +7,3 @@ RSpec::Matchers.define :have_attributes do |expected_attributes|
     expected_attributes.map(&:to_sym).all? { |attr| actual_attributes.include?(attr) }
   end
 end
-

data/spec/test_views/spree/api/widgets/show.v1.rabl

@@ -1,2 +1,2 @@
 object @object
-attributes :name, :position
+attributes :id, :name, :position

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-12 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.3
+        version: 1.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: '3.0'
 description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
@@ -105,7 +105,6 @@ files:
 - app/controllers/spree/api/zones_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/api_configuration.rb
-- app/models/spree/option_value_decorator.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
@@ -279,12 +278,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: REST API for the Solidus e-commerce framework.

data/app/models/spree/option_value_decorator.rb

@@ -1,9 +0,0 @@
-Spree::OptionValue.class_eval do
-  def option_type_name
-    option_type.name
-  end
-
-  def option_type_presentation
-    option_type.presentation
-  end
-end