spree_api 2.3.4 → 2.3.5

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::ZonesController do
+  describe Api::ZonesController, :type => :controller do
     render_views
 
     let!(:attributes) { [:id, :name, :zone_members] }
@@ -13,29 +13,29 @@ module Spree
 
     it "gets list of zones" do
       api_get :index
-      json_response['zones'].first.should have_attributes(attributes)
+      expect(json_response['zones'].first).to have_attributes(attributes)
     end
 
     it 'can control the page size through a parameter' do
       create(:zone)
       api_get :index, :per_page => 1
-      json_response['count'].should == 1
-      json_response['current_page'].should == 1
-      json_response['pages'].should == 2
+      expect(json_response['count']).to eq(1)
+      expect(json_response['current_page']).to eq(1)
+      expect(json_response['pages']).to eq(2)
     end
 
     it 'can query the results through a paramter' do
       expected_result = create(:zone, :name => 'South America')
       api_get :index, :q => { :name_cont => 'south' }
-      json_response['count'].should == 1
-      json_response['zones'].first['name'].should eq expected_result.name
+      expect(json_response['count']).to eq(1)
+      expect(json_response['zones'].first['name']).to eq expected_result.name
     end
 
     it "gets a zone" do
       api_get :show, :id => @zone.id
-      json_response.should have_attributes(attributes)
-      json_response['name'].should eq @zone.name
-      json_response['zone_members'].size.should eq @zone.zone_members.count
+      expect(json_response).to have_attributes(attributes)
+      expect(json_response['name']).to eq @zone.name
+      expect(json_response['zone_members'].size).to eq @zone.zone_members.count
     end
 
     context "specifying a rabl template to use" do
@@ -50,13 +50,13 @@ module Spree
       it "uses the specified template" do
         request.headers['X-Spree-Template'] = 'show'
         api_get :custom_show, :id => @zone.id
-        response.should render_template('spree/api/zones/show')
+        expect(response).to render_template('spree/api/zones/show')
       end
 
       it "falls back to the default template if the specified template does not exist" do
         request.headers['X-Spree-Template'] = 'invoice'
         api_get :show, :id => @zone.id
-        response.should render_template('spree/api/zones/show')
+        expect(response).to render_template('spree/api/zones/show')
       end
     end
 
@@ -77,9 +77,9 @@ module Spree
         }
 
         api_post :create, params
-        response.status.should == 201
-        json_response.should have_attributes(attributes)
-        json_response["zone_members"].should_not be_empty
+        expect(response.status).to eq(201)
+        expect(json_response).to have_attributes(attributes)
+        expect(json_response["zone_members"]).not_to be_empty
       end
 
       it "updates a zone" do
@@ -96,15 +96,15 @@ module Spree
         }
 
         api_put :update, params
-        response.status.should == 200
-        json_response['name'].should eq 'North Pole'
-        json_response['zone_members'].should_not be_blank
+        expect(response.status).to eq(200)
+        expect(json_response['name']).to eq 'North Pole'
+        expect(json_response['zone_members']).not_to be_blank
       end
 
       it "can delete a zone" do
         api_delete :destroy, :id => @zone.id
-        response.status.should == 204
-        lambda { @zone.reload }.should raise_error(ActiveRecord::RecordNotFound)
+        expect(response.status).to eq(204)
+        expect { @zone.reload }.to raise_error(ActiveRecord::RecordNotFound)
       end
     end
   end

data/spec/models/spree/legacy_user_spec.rb

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 module Spree
-  describe LegacyUser do
+  describe LegacyUser, :type => :model do
     let(:user) { LegacyUser.new }
 
     it "can generate an API key" do
-      user.should_receive(:save!)
+      expect(user).to receive(:save!)
       user.generate_spree_api_key!
-      user.spree_api_key.should_not be_blank
+      expect(user.spree_api_key).not_to be_blank
     end
 
     it "can clear an API key" do
-      user.should_receive(:save!)
+      expect(user).to receive(:save!)
       user.clear_spree_api_key!
-      user.spree_api_key.should be_blank
+      expect(user.spree_api_key).to be_blank
     end
   end
 end

data/spec/requests/rabl_cache_spec.rb

@@ -1,32 +1,32 @@
 require 'spec_helper'
 
-describe "Rabl Cache", :caching => true do
+describe "Rabl Cache", :type => :request, :caching => true do
   let!(:user)  { create(:admin_user) }
 
   before do
     create(:variant) 
     user.generate_spree_api_key!
-    Spree::Product.count.should == 1
+    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
-    response.status.should == 200
+    expect(response.status).to eq(200)
 
     # Make sure we get a non master variant
     variant_a = JSON.parse(response.body)['variants'].select do |v|
       !v['is_master']
     end.first
 
-    variant_a['is_master'].should be false
-    variant_a['stock_items'].should_not be_nil
+    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
-    response.status.should == 200
+    expect(response.status).to eq(200)
     variant_b = JSON.parse(response.body)['variants'].last
-    variant_b['is_master'].should be false
+    expect(variant_b['is_master']).to be false
 
-    variant_a['id'].should == variant_b['id']
-    variant_b['stock_items'].should be_nil
+    expect(variant_a['id']).to eq(variant_b['id'])
+    expect(variant_b['stock_items']).to be_nil
   end
 end

data/spec/spec_helper.rb

@@ -22,7 +22,6 @@ rescue LoadError
 end
 
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'ffaker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-11-20 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.3.4
+        version: 2.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.5
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement