spree_favorite_products 3.0.0 → 3.2.0

data/spec/controllers/spree/favorite_products_controller_spec.rb

@@ -6,38 +6,33 @@ describe Spree::FavoriteProductsController do
 
   shared_examples_for "request which requires user authentication" do
     it "authenticates user" do
-      controller.should_receive(:authenticate_spree_user!)
+      expect(controller).to receive(:authenticate_spree_user!)
       send_request
     end
   end
 
   shared_examples_for "request which finds favorite product" do
     it "finds favorite product" do
-      @current_user_favorites.should_receive(:where).with(:spree_products => {:id => 'id'})
-      send_request
-    end
-
-    it "sets readonly to false" do
-      @current_user_favorites.should_receive(:readonly).with(false)
+      expect(@favorites).to receive(:with_product_id).with('id')
       send_request
     end
 
     it "assigns @favorite" do
       send_request
-      assigns(:favorite).should eq(@favorite)
+      expect(assigns(:favorite)).to eq(@favorite)
     end
   end
 
   describe 'POST create' do
     def send_request
-      post :create, :id => 1, :format => :js, :use_route => 'spree'
+      post :create, params: { id: 1 }, as: :js
     end
 
     before(:each) do
-      @favorite = mock_model(Spree::Favorite, :save => true)
+      @favorite = mock_model(Spree::Favorite, save: true)
       allow(controller).to receive(:authenticate_spree_user!).and_return(true)
       allow(Spree::Favorite).to receive(:new).and_return(@favorite)
-      @user = mock_model(Spree::User, :favorites => Spree::Favorite, :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)
+      @user = mock_model(Spree::User, favorites: Spree::Favorite, generate_spree_api_key!: false, last_incomplete_spree_order: nil)
       allow(controller).to receive(:spree_current_user).and_return(@user)
     end
 
@@ -45,24 +40,24 @@ describe Spree::FavoriteProductsController do
 
 
     it "creates favorite" do
-      Spree::Favorite.should_receive(:new).with(:product_id => 1)
+      expect(Spree::Favorite).to receive(:new).with(product_id: 1)
       send_request
     end
 
     it "saves favorite" do
-      @favorite.should_receive(:save)
+      expect(@favorite).to receive(:save)
       send_request
     end
 
     context "when favorite saved successfully" do
       it "renders create" do
         send_request
-        response.should render_template(:create)
+        expect(response).to render_template(:create)
       end
 
       it "should assign success message" do
         send_request
-        assigns(:message).should eq("Product has been successfully marked as favorite")
+        expect(assigns(:message)).to eq("Product has been successfully marked as favorite")
       end
     end
 
@@ -75,19 +70,19 @@ describe Spree::FavoriteProductsController do
 
       it "renders create template" do
         send_request
-        response.should render_template(:create)
+        expect(response).to render_template(:create)
       end
 
       it "should assign error message" do
         send_request
-        assigns(:message).should eq("Product already marked as favorite")
+        expect(assigns(:message)).to eq("Product already marked as favorite")
       end
     end
   end
 
   describe 'GET index' do
     def send_request
-      get :index, :page => 'current_page', :use_route => 'spree'
+      get :index, params: { page: 'current_page' }
     end
 
     before(:each) do
@@ -95,50 +90,47 @@ describe Spree::FavoriteProductsController do
       allow(@favorite_products).to receive(:page).and_return(@favorite_products)
       allow(@favorite_products).to receive(:per).and_return(@favorite_products)
       allow(Spree::Config).to receive(:favorite_products_per_page).and_return('favorite_products_per_page')
-      @user = mock_model(Spree::User, :favorite_products => @favorite_products, :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)
+      @user = mock_model(Spree::User, favorite_products: @favorite_products, generate_spree_api_key!: false, last_incomplete_spree_order: nil)
       allow(controller).to receive(:authenticate_spree_user!).and_return(true)
       allow(controller).to receive(:spree_current_user).and_return(@user)
     end
 
     it "authenticates user" do
-      controller.should_receive(:authenticate_spree_user!)
+      expect(controller).to receive(:authenticate_spree_user!)
       send_request
     end
 
     it "finds favorite products of current user" do
-      @user.should_receive(:favorite_products)
+      expect(@user).to receive(:favorite_products)
       send_request
     end
 
     it "paginates favorite products" do
-      @favorite_products.should_receive(:page).with('current_page')
+      expect(@favorite_products).to receive(:page).with('current_page')
       send_request
     end
 
     it "shows Spree::Config.favorite_products_per_page" do
-      @favorite_products.should_receive(:per).with('favorite_products_per_page')
+      expect(@favorite_products).to receive(:per).with('favorite_products_per_page')
       send_request
     end
 
     it "assigns @favorite_products" do
       send_request
-      assigns(:favorite_products).should eq(@favorite_products)
+      expect(assigns(:favorite_products)).to eq(@favorite_products)
     end
   end
 
   describe 'destroy' do
     def send_request(params = {})
-      post :destroy, params.merge({:use_route => 'spree', :method => :delete, :format => :js, :id => 'id'})
+      post :destroy, params: params.merge({method: :delete, id: 'id'}), as: :js
     end
 
     before do
       @favorite = mock_model(Spree::Favorite)
-      @current_user_favorites = double('spree_favorites')
-      allow(@current_user_favorites).to receive(:where).and_return([@favorite])
-      allow(@current_user_favorites).to receive(:readonly).and_return(@current_user_favorites)
       @favorites = double('spree_favorites')
-      allow(@favorites).to receive(:joins).with(:product).and_return(@current_user_favorites)
-      @user = mock_model(Spree::User, :favorites => @favorites, :generate_spree_api_key! => false, :last_incomplete_spree_order => nil)
+      allow(@favorites).to receive(:with_product_id).and_return([@favorite])
+      @user = mock_model(Spree::User, favorites: @favorites, generate_spree_api_key!: false, last_incomplete_spree_order: nil)
       allow(controller).to receive(:authenticate_spree_user!).and_return(true)
       allow(controller).to receive(:spree_current_user).and_return(@user)
     end
@@ -152,7 +144,7 @@ describe Spree::FavoriteProductsController do
       end
 
       it 'destroys' do
-        @favorite.should_receive(:destroy)
+        expect(@favorite).to receive(:destroy)
         send_request
       end
 
@@ -163,7 +155,7 @@ describe Spree::FavoriteProductsController do
 
         it "sets @success to true" do
           send_request
-          assigns(:success).should eq(true)
+          expect(assigns(:success)).to eq(true)
         end
       end
 
@@ -174,7 +166,7 @@ describe Spree::FavoriteProductsController do
 
         it 'sets @success to false' do
           send_request
-          assigns(:success).should eq(false)
+          expect(assigns(:success)).to eq(false)
         end
       end
     end

data/spec/models/spree/app_configuration_decorator_spec.rb

@@ -1,3 +1,3 @@
 describe Spree::AppConfiguration do
-  it { Spree::Config.favorite_products_per_page.should eq 10 }
-end
+  it { expect(Spree::Config.favorite_products_per_page).to eq 10 }
+end

data/spec/models/spree/favorite_spec.rb

@@ -1,30 +1,32 @@
 require 'spec_helper'
 
 describe Spree::Favorite do
-  it { should belong_to(:product) }
-  it { should belong_to(:user) }
-  it { should validate_uniqueness_of(:product_id).scoped_to(:user_id).with_message("already marked as favorite") }
-  it { should validate_presence_of(:user_id) }
-  it { should validate_presence_of(:product_id) }
+  it { is_expected.to belong_to(:product) }
+  it { is_expected.to belong_to(:user) }
+  it { is_expected.to validate_uniqueness_of(:product_id).scoped_to(:user_id).with_message("already marked as favorite") }
+  it { is_expected.to validate_presence_of(:user).with_message(:required) }
+  it { is_expected.to validate_presence_of(:product).with_message(:required) }
 
-  context "when product_id is present" do
+  describe ".with_product_id" do
     before(:each) do
-      @favorite = Spree::Favorite.new :product_id => 'invalid product id'
+      shipping_category = Spree::ShippingCategory.create! name: 'shipping_category'
+      @favorite_product1 = Spree::Product.create! name: 'favorite_product1', price: 100, shipping_category_id: shipping_category.id
+      @favorite_product2 = Spree::Product.create! name: 'favorite_product2', price: 100, shipping_category_id: shipping_category.id
+      @product1 = Spree::Product.create! name: 'product1', price: 100, shipping_category_id: shipping_category.id
+      @product2 = Spree::Product.create! name: 'product2', price: 100, shipping_category_id: shipping_category.id
+      @user1 = Spree::User.create! email: 'user1@example.com', password: 'example', password_confirmation: "example"
+      @user2 = Spree::User.create! email: 'user2@example.com', password: "example", password_confirmation: 'example'
+      @favorite1 = @user1.favorites.create! product_id: @favorite_product1.id
+      @favorite2 = @user2.favorites.create! product_id: @favorite_product1.id
+      @favorite3 = @user2.favorites.create! product_id: @favorite_product2.id
     end
-    it "checks for the presence of product" do
-      @favorite.valid?
-      @favorite.errors[:product].should eq(["is invalid"])
-    end
-  end
 
-  context "when product_id is not present" do
-    before(:each) do
-      @favorite = Spree::Favorite.new
+    it "expects to list favorites with given product id" do
+      expect(Spree::Favorite.with_product_id(@favorite_product1.id)).to include(@favorite1, @favorite2)
     end
 
-    it "does not validate the presence of product" do
-      @favorite.valid?
-      @favorite.errors[:product].should eq([])
+    it "expects not to list favorites with other product id" do
+      expect(Spree::Favorite.with_product_id(@favorite_product1.id)).not_to include(@favorite3)
     end
   end
-end
+end

data/spec/models/spree/product_decorator_spec.rb

@@ -2,41 +2,41 @@ require 'spec_helper'
 
 describe Spree::Product do
   before(:each) do
-    shipping_category = Spree::ShippingCategory.create! :name => 'shipping_category'
-    @favorite_product1 = Spree::Product.create! :name => 'favorite_product1', :price => 100, :shipping_category_id => shipping_category.id
-    @favorite_product2 = Spree::Product.create! :name => 'favorite_product2', :price => 100, :shipping_category_id => shipping_category.id
-    @product1 = Spree::Product.create! :name => 'product1', :price => 100, :shipping_category_id => shipping_category.id
-    @product2 = Spree::Product.create! :name => 'product2', :price => 100, :shipping_category_id => shipping_category.id
-    @user1 = Spree::User.create! :email => 'user1@example.com', :password => 'example', :password_confirmation => "example"
-    @user2 = Spree::User.create! :email => 'user2@example.com', :password => "example", :password_confirmation => 'example'
-    @user1.favorites.create! :product_id => @favorite_product1.id
-    @user2.favorites.create! :product_id => @favorite_product1.id
-    @user2.favorites.create! :product_id => @favorite_product2.id
+    shipping_category = Spree::ShippingCategory.create! name: 'shipping_category'
+    @favorite_product1 = Spree::Product.create! name: 'favorite_product1', price: 100, shipping_category_id: shipping_category.id
+    @favorite_product2 = Spree::Product.create! name: 'favorite_product2', price: 100, shipping_category_id: shipping_category.id
+    @product1 = Spree::Product.create! name: 'product1', price: 100, shipping_category_id: shipping_category.id
+    @product2 = Spree::Product.create! name: 'product2', price: 100, shipping_category_id: shipping_category.id
+    @user1 = Spree::User.create! email: 'user1@example.com', password: 'example', password_confirmation: "example"
+    @user2 = Spree::User.create! email: 'user2@example.com', password: "example", password_confirmation: 'example'
+    @user1.favorites.create! product_id: @favorite_product1.id
+    @user2.favorites.create! product_id: @favorite_product1.id
+    @user2.favorites.create! product_id: @favorite_product2.id
   end
 
 
-  it { should have_many(:favorites).dependent(:destroy) }
-  it { should have_many(:favorite_users).through(:favorites).class_name('Spree::User') }
+  it { is_expected.to have_many(:favorites).dependent(:destroy) }
+  it { is_expected.to have_many(:favorite_users).through(:favorites).class_name('Spree::User') }
 
   describe "Spree::Product.favorite" do
 
 
     it "returns favorite products" do
-      Spree::Product.favorite.should =~ [@favorite_product1, @favorite_product2]
+      expect(Spree::Product.favorite).to match_array([@favorite_product1, @favorite_product2])
     end
   end
 
   describe ".order_by_favorite_users_count" do
     context 'when order not passed' do
       it "returns products ordered by users_count in descending order" do
-        Spree::Product.favorite.order_by_favorite_users_count.should eq([@favorite_product1, @favorite_product2])
+        expect(Spree::Product.favorite.order_by_favorite_users_count).to eq([@favorite_product1, @favorite_product2])
       end
     end
 
     context 'when asc order passed' do
       it "returns products ordered by users_count in ascending order" do
-        Spree::Product.favorite.order_by_favorite_users_count(true).should eq([@favorite_product2, @favorite_product1])
+        expect(Spree::Product.favorite.order_by_favorite_users_count(true)).to eq([@favorite_product2, @favorite_product1])
       end
     end
   end
-end
+end

data/spec/models/spree/user_decorator_spec.rb

@@ -2,25 +2,26 @@ require 'spec_helper'
 
 describe Spree::User do
   before(:each) do
-    @user = Spree::User.create! :email => 'test@example.com', :password => 'spree123'
-    @product1 = Spree::Product.create! :name => 'product1', :price => 100, :shipping_category_id => 1
-    @product2 = Spree::Product.create! :name => 'product2', :price => 100, :shipping_category_id => 1
+    @user = Spree::User.create! email: 'test@example.com', password: 'spree123'
+    shipping_category = Spree::ShippingCategory.create! name: 'shipping_category'
+    @product1 = Spree::Product.create! name: 'product1', price: 100, shipping_category_id: shipping_category.id
+    @product2 = Spree::Product.create! name: 'product2', price: 100, shipping_category_id: shipping_category.id
     favorite = Spree::Favorite.new
     favorite.product_id = @product1.id
     favorite.user_id = @user.id
     favorite.save!
   end
 
-  it { should have_many(:favorites).dependent(:destroy) }
-  it { should have_many(:favorite_products).through(:favorites).class_name('Spree::Product') }
+  it { is_expected.to have_many(:favorites).dependent(:destroy) }
+  it { is_expected.to have_many(:favorite_products).through(:favorites).class_name('Spree::Product') }
 
   describe "has_favorite_product?" do
     context "when product in user's favorite products" do
-      it { @user.has_favorite_product?(@product1.id).should be_true }
+      it { expect(@user.has_favorite_product?(@product1.id)).to be_truthy }
     end
 
     context 'when product is not in users favorite products' do
-      it { @user.has_favorite_product?(@product2.id).should be_false }
+      it { expect(@user.has_favorite_product?(@product2.id)).to be_falsey }
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
 require 'spree/testing_support/controller_requests'
 require 'spree/testing_support/authorization_helpers'
 require 'spree/testing_support/url_helpers'
+require 'spree/testing_support/preferences'
 
 # Requires factories defined in lib/spree_favorite_products/factories.rb
 # require 'spree_favorite_products/factories'
@@ -43,6 +44,7 @@ RSpec.configure do |config|
   # visit spree.admin_path
   # current_path.should eql(spree.products_path)
   config.include Spree::TestingSupport::UrlHelpers
+  config.include Devise::Test::ControllerHelpers, type: :controller
 
   # == Mock Framework
   #
@@ -79,5 +81,24 @@ RSpec.configure do |config|
     DatabaseCleaner.clean
   end
 
+  config.include Spree::TestingSupport::Preferences
+  config.include Spree::TestingSupport::ControllerRequests, type: :controller
+  config.include Spree::Core::Engine.routes.url_helpers
+
   config.fail_fast = ENV['FAIL_FAST'] || false
+  config.infer_spec_type_from_file_location!
+  config.expose_current_running_example_as :example
+end
+
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose a test framework:
+    with.test_framework :rspec
+    # Choose one or more libraries:
+    with.library :active_record
+    with.library :active_model
+    with.library :action_controller
+    # Or, choose the following (which implies all of the above):
+    # with.library :rails
+  end
 end

data/spree_favorite_products.gemspec

@@ -2,20 +2,24 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_favorite_products'
-  s.version     = '3.0.0'
+  s.version     = '3.2.0'
   s.summary     = 'Favorite Products in Spree'
   s.description = 'This extension adds the following features: 1. Adds a link Mark as favorite on product detail page. 2. Favorite Products tab on header 3. Favorite Products tab in admin section'
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.1.0'
 
-  s.author    = 'Mohit Bansal'
+  s.author    = ['Mohit Bansal', 'Anurag Bharadwaj', '+ vinsol team']
   s.email     = 'info@vinsol.com'
   s.homepage  = 'http://vinsol.com'
   s.license   = "MIT"
 
   s.files       = `git ls-files`.split("\n")
-  #s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 3.0.0'
+  s.add_dependency 'spree_core', '~> 3.2.0'
+  s.add_development_dependency 'coffee-rails', '~> 4.2.1'
+  s.add_development_dependency 'sass-rails', '~> 5.0'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'sqlite3'
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: spree_favorite_products
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Mohit Bansal
+- Anurag Bharadwaj
+- "+ vinsol team"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-02 00:00:00.000000000 Z
+date: 2017-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +18,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: coffee-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: sass-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'This extension adds the following features: 1. Adds a link Mark as favorite
   on product detail page. 2. Favorite Products tab on header 3. Favorite Products
   tab in admin section'
@@ -36,17 +94,22 @@ files:
 - ".rspec"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - Versionfile
 - app/.DS_Store
 - app/assets/javascripts/admin/spree_favorite_products.js
+- app/assets/javascripts/spree/backend/spree_favorite_products.js
+- app/assets/javascripts/spree/frontend/spree_favorite_products.js
 - app/assets/javascripts/store/spree_favorite_products.js
 - app/assets/stylesheets/admin/spree_favorite_products.css
+- app/assets/stylesheets/spree/backend/spree_favorite_products.css
+- app/assets/stylesheets/spree/frontend/spree_favorite_products.css
 - app/assets/stylesheets/store/spree_favorite_products.css
 - app/controllers/spree/admin/favorite_products_controller.rb
+- app/controllers/spree/admin/products_controller_decorator.rb
+- app/controllers/spree/admin/users_controller_decorator.rb
 - app/controllers/spree/favorite_products_controller.rb
 - app/models/spree/app_configuration_decorator.rb
 - app/models/spree/favorite.rb
@@ -55,24 +118,34 @@ files:
 - app/overrides/.DS_Store
 - app/overrides/add_favorite_products_per_page_configuration.rb
 - app/overrides/add_favorite_products_to_products_tab.rb
+- app/overrides/add_favorite_users_tab_to_products.rb
 - app/overrides/add_link_to_mark_product_as_favorite.rb
 - app/overrides/add_link_to_users_favorite_products.rb
+- app/overrides/addd_favorite_products_tab_to_users.rb
 - app/views/spree/.DS_Store
+- app/views/spree/admin/favorite_products/_users.html.erb
 - app/views/spree/admin/favorite_products/index.html.erb
 - app/views/spree/admin/favorite_products/users.html.erb
+- app/views/spree/admin/products/favorite_users.html.erb
+- app/views/spree/admin/users/favorite_products.html.erb
 - app/views/spree/favorite_products/create.js.erb
 - app/views/spree/favorite_products/destroy.js.erb
 - app/views/spree/favorite_products/index.html.erb
+- config/locales/bg.yml
 - config/locales/en.yml
+- config/locales/pl.yml
 - config/routes.rb
 - db/migrate/20130705080641_create_table_favorites.rb
 - db/migrate/20130710105100_rename_favorites_to_spree_favorites.rb
+- db/migrate/20160304152800_add_favorites_user_counts_to_product.rb
 - lib/generators/spree_favorite_products/install/install_generator.rb
 - lib/spree_favorite_products.rb
 - lib/spree_favorite_products/engine.rb
 - lib/spree_favorite_products/factories.rb
 - script/rails
 - spec/controllers/spree/admin/favorite_products_controller_spec.rb
+- spec/controllers/spree/admin/products_controller_decorator_spec.rb
+- spec/controllers/spree/admin/users_controller_decorator_spec.rb
 - spec/controllers/spree/favorite_products_controller_spec.rb
 - spec/models/spree/app_configuration_decorator_spec.rb
 - spec/models/spree/favorite_spec.rb
@@ -92,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -101,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Favorite Products in Spree