spree_favorite_products 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba77e7e7f4b1bf6977e5064ca0954ba99eac719
-  data.tar.gz: a10d97d7602d782c7d52e45ad5eaf7e34e5c6ea0
+  metadata.gz: f11f3c8880f83651bdb24fe9c818946085b4d8d0
+  data.tar.gz: 6628a06e36d08be97e9c6fd6b567b8f9228c1a78
 SHA512:
-  metadata.gz: 3cfa733b36313aac41f671f8e48a097ece12f9bc36e21b2880e51d4a029f459dc962cda11d82d9b79f3c0e095c5ffec089bd73653e87f5ef22a45771a63d889d
-  data.tar.gz: 855b9720e169b3483dce2491eb8834744a608fe78c662ca51fa5cdc259a938f3e0a4ba8205869bee471f7563afe66e25a1dc706f8eb435ec39898460187000ff
+  metadata.gz: 6fe013be6540e9c4797b8a71ec3f0c87d8f52841a8cfe18639a380bc4cd7e1b6d99cebd41730d1a16ff3910339d99b516a6213747a4220b56f2add2040803a09
+  data.tar.gz: 0d72ec7b52bb628f6b0e67fc056da1c79b610c90264257f4a129a448f48572dbb1aa87e1e6bcf2ee85ac3fd5119440cbd6def1350de2def05fd884e2f87afe24

data/.gitignore

@@ -1 +1,4 @@
-.ruby-version
+/spec/dummy
+/coverage
+.DS_STORE
+.ruby-version

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - ruby-1.9.3
+  - ruby-2.1.6
 script:
   - bundle exec rake test_app
-  - bundle exec rspec .
+  - bundle exec rspec spec

data/Gemfile

@@ -1,18 +1,18 @@
 source 'https://rubygems.org'
 
 # Provides basic authentication functionality for testing parts of your engine
-gem 'spree', '2.3.0'
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable'
+gem 'spree', '~> 3.0.0'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable'
 gem 'mysql2'
+gem 'sass-rails', '~> 5.0'
 
-group :assets do
+group :assets do 
   gem 'coffee-rails', '4.0.1'
-  gem 'sass-rails'
 end
 
 group :test do
   gem 'rspec-rails', '~> 2.10'
-  gem 'shoulda-matchers', '2.6.0'
+  gem 'shoulda-matchers', '2.2.0'
   gem 'simplecov', :require => false
   gem 'database_cleaner'
 end

data/Gemfile.lock

@@ -1,75 +1,85 @@
 GIT
   remote: git://github.com/spree/spree_auth_devise.git
-  revision: b3b63f1fa01e8ccce300b663f8405fd190d9d9ba
-  branch: 2-3-stable
+  revision: f231fce43686d66fe3e6d65ba8595b4474c49895
+  branch: 3-0-stable
   specs:
-    spree_auth_devise (2.3.0)
-      devise (~> 3.2.3)
+    spree_auth_devise (3.0.0)
+      devise (~> 3.4.1)
       devise-encryptable (= 0.1.2)
       json
       multi_json
-      spree_core (~> 2.3.0)
+      spree_core (~> 3.0.0)
 
 PATH
   remote: .
   specs:
-    spree_favorite_products (2.3.0)
-      spree_core (~> 2.3.0)
+    spree_favorite_products (2.2.3)
+      spree_core (~> 3.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
+    actionmailer (4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.14)
-      actionview (= 4.1.14)
-      activesupport (= 4.1.14)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5)
+      actionview (= 4.2.5)
+      activesupport (= 4.2.5)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.14)
-      activesupport (= 4.1.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    active_utils (2.2.3)
-      activesupport (>= 2.3.11)
-      i18n
-    activemerchant (1.43.3)
-      active_utils (~> 2.0, >= 2.0.1)
-      activesupport (>= 2.3.14, < 5.0.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5)
+      activesupport (= 4.2.5)
+      globalid (>= 0.3.0)
+    activemerchant (1.47.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
-      json (~> 1.7)
-      money (< 7.0.0)
+      i18n (>= 0.6.9)
       nokogiri (~> 1.4)
-    activemodel (4.1.14)
-      activesupport (= 4.1.14)
+    activemodel (4.2.5)
+      activesupport (= 4.2.5)
       builder (~> 3.1)
-    activerecord (4.1.14)
-      activemodel (= 4.1.14)
-      activesupport (= 4.1.14)
-      arel (~> 5.0.0)
-    activesupport (4.1.14)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.5)
+      activemodel (= 4.2.5)
+      activesupport (= 4.2.5)
+      arel (~> 6.0)
+    activesupport (4.2.5)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    acts_as_list (0.3.0)
+    acts_as_list (0.7.2)
       activerecord (>= 3.0)
-    arel (5.0.1.20140414130214)
+    addressable (2.3.8)
+    arel (6.0.3)
+    autoprefixer-rails (6.1.1)
+      execjs
+      json
     awesome_nested_set (3.0.2)
       activerecord (>= 4.0.0, < 5)
-    aws-sdk (1.27.0)
-      json (~> 1.4)
-      nokogiri (>= 1.4.4)
-      uuidtools (~> 2.1)
     bcrypt (3.1.10)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
     builder (3.2.2)
-    cancan (1.6.10)
+    camertron-eprun (1.1.0)
+    cancancan (1.10.1)
     canonical-rails (0.0.11)
       rails (>= 3.1, < 5.0)
+    carmen (1.0.2)
+      activesupport (>= 3.0.0)
+    cldr-plurals-runtime-rb (1.0.1)
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cocaine (0.5.8)
@@ -82,16 +92,19 @@ GEM
       execjs
     coffee-script-source (1.10.0)
     colorize (0.7.7)
+    css_parser (1.3.7)
+      addressable
     database_cleaner (1.5.1)
     deface (1.0.2)
       colorize (>= 0.5.8)
       nokogiri (~> 1.6.0)
       polyglot
       rails (>= 3.1)
-    devise (3.2.4)
+    devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     devise-encryptable (0.1.2)
@@ -103,22 +116,28 @@ GEM
     ffaker (1.32.1)
     font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
-    friendly_id (5.0.5)
+    friendly_id (5.1.0)
       activerecord (>= 4.0.0)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     highline (1.6.21)
+    htmlentities (4.3.4)
     httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
-    jquery-rails (3.1.4)
-      railties (>= 3.0, < 5.0)
+    i18n (0.7.0)
+    jquery-rails (4.0.5)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (4.1.2)
-      railties (>= 3.1.0)
+    jquery-ui-rails (5.0.5)
+      railties (>= 3.2.16)
     json (1.8.3)
-    kaminari (0.15.1)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.99)
@@ -134,43 +153,60 @@ GEM
     nokogiri (1.6.7)
       mini_portile2 (~> 2.0.0.rc2)
     orm_adapter (0.5.0)
-    paperclip (4.1.1)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
+    paperclip (4.2.4)
+      activemodel (>= 3.2.0)
+      activesupport (>= 3.2.0)
+      cocaine (~> 0.5.5)
       mime-types
     paranoia (2.1.4)
       activerecord (~> 4.0)
-    polyamorous (1.0.0)
+    polyamorous (1.2.0)
       activerecord (>= 3.0)
     polyglot (0.3.5)
+    premailer (1.8.6)
+      css_parser (>= 1.3.6)
+      htmlentities (>= 4.0.0)
+    premailer-rails (1.8.2)
+      actionmailer (>= 3, < 5)
+      premailer (~> 1.7, >= 1.7.9)
     rabl (0.9.4.pre1)
       activesupport (>= 2.3.14)
-    rack (1.5.5)
+    rack (1.6.4)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.14)
-      actionmailer (= 4.1.14)
-      actionpack (= 4.1.14)
-      actionview (= 4.1.14)
-      activemodel (= 4.1.14)
-      activerecord (= 4.1.14)
-      activesupport (= 4.1.14)
+    rails (4.2.5)
+      actionmailer (= 4.2.5)
+      actionpack (= 4.2.5)
+      actionview (= 4.2.5)
+      activejob (= 4.2.5)
+      activemodel (= 4.2.5)
+      activerecord (= 4.2.5)
+      activesupport (= 4.2.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.14)
-      sprockets-rails (~> 2.0)
-    railties (4.1.14)
-      actionpack (= 4.1.14)
-      activesupport (= 4.1.14)
+      railties (= 4.2.5)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.2)
+      loofah (~> 2.0)
+    railties (4.2.5)
+      actionpack (= 4.2.5)
+      activesupport (= 4.2.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    ransack (1.2.3)
+    ransack (1.4.1)
       actionpack (>= 3.0)
       activerecord (>= 3.0)
       activesupport (>= 3.0)
       i18n
-      polyamorous (~> 1.0.0)
+      polyamorous (~> 1.1)
+    responders (2.1.0)
+      railties (>= 4.2.0, < 5)
     rspec-collection_matchers (1.1.2)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-core (2.99.2)
@@ -193,80 +229,95 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    select2-rails (3.5.9.3)
+    select2-rails (3.5.9.1)
       thor (~> 0.14)
-    shoulda-matchers (2.6.0)
+    shoulda-matchers (2.2.0)
       activesupport (>= 3.0.0)
-    simplecov (0.11.1)
+    simplecov (0.11.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    spree (2.3.0)
-      spree_api (= 2.3.0)
-      spree_backend (= 2.3.0)
-      spree_cmd (= 2.3.0)
-      spree_core (= 2.3.0)
-      spree_frontend (= 2.3.0)
-      spree_sample (= 2.3.0)
-    spree_api (2.3.0)
+    spree (3.0.4)
+      spree_api (= 3.0.4)
+      spree_backend (= 3.0.4)
+      spree_cmd (= 3.0.4)
+      spree_core (= 3.0.4)
+      spree_frontend (= 3.0.4)
+      spree_sample (= 3.0.4)
+    spree_api (3.0.4)
       rabl (~> 0.9.4.pre1)
-      spree_core (= 2.3.0)
+      spree_core (= 3.0.4)
       versioncake (~> 2.3.1)
-    spree_backend (2.3.0)
-      jquery-rails (~> 3.1.0)
-      jquery-ui-rails (~> 4.1.0)
-      select2-rails (~> 3.5.0)
-      spree_api (= 2.3.0)
-      spree_core (= 2.3.0)
-    spree_cmd (2.3.0)
+    spree_backend (3.0.4)
+      bootstrap-sass (~> 3.3.1)
+      jquery-rails (~> 4.0.3)
+      jquery-ui-rails (~> 5.0.0)
+      select2-rails (= 3.5.9.1)
+      spree_api (= 3.0.4)
+      spree_core (= 3.0.4)
+      sprockets-rails (~> 2.2)
+    spree_cmd (3.0.4)
       thor (~> 0.14)
-    spree_core (2.3.0)
-      activemerchant (~> 1.43.1)
-      acts_as_list (= 0.3.0)
-      awesome_nested_set (~> 3.0.0.rc.3)
-      aws-sdk (= 1.27.0)
-      cancan (~> 1.6.10)
+    spree_core (3.0.4)
+      activemerchant (~> 1.47.0)
+      acts_as_list (~> 0.6)
+      awesome_nested_set (~> 3.0.1)
+      cancancan (~> 1.10.1)
+      carmen (~> 1.0.0)
       deface (~> 1.0.0)
       ffaker (~> 1.16)
       font-awesome-rails (~> 4.0)
-      friendly_id (~> 5.0.4)
+      friendly_id (~> 5.1.0)
       highline (~> 1.6.18)
       httparty (~> 0.11)
-      i18n (= 0.6.9)
       json (~> 1.7)
-      kaminari (~> 0.15.0)
-      monetize
-      paperclip (~> 4.1.1)
-      paranoia (~> 2.0)
-      rails (~> 4.1.2)
-      ransack (~> 1.2.2)
-      state_machine (= 1.2.0)
-      stringex (~> 1.5.1)
+      kaminari (~> 0.15, >= 0.15.1)
+      monetize (~> 1.1)
+      paperclip (~> 4.2.0)
+      paranoia (~> 2.1.0)
+      premailer-rails
+      rails (~> 4.2.2)
+      ransack (~> 1.4.1)
+      responders
+      state_machines-activerecord (~> 0.2)
+      stringex
       truncate_html (= 0.9.2)
-    spree_frontend (2.3.0)
+      twitter_cldr (~> 3.0)
+    spree_frontend (3.0.4)
+      bootstrap-sass (~> 3.3.1)
       canonical-rails (~> 0.0.4)
-      jquery-rails (~> 3.1.0)
-      spree_api (= 2.3.0)
-      spree_core (= 2.3.0)
-      stringex (~> 1.5.1)
-    spree_sample (2.3.0)
-      spree_core (= 2.3.0)
+      jquery-rails (~> 4.0.3)
+      spree_api (= 3.0.4)
+      spree_core (= 3.0.4)
+      sprockets-rails (~> 2.2)
+    spree_sample (3.0.4)
+      spree_core (= 3.0.4)
     sprockets (3.4.1)
       rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    state_machine (1.2.0)
-    stringex (1.5.1)
+    state_machines (0.4.0)
+    state_machines-activemodel (0.3.0)
+      activemodel (~> 4.1)
+      state_machines (>= 0.4.0)
+    state_machines-activerecord (0.3.0)
+      activerecord (~> 4.1)
+      state_machines-activemodel (>= 0.3.0)
+    stringex (2.5.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (2.0.1)
     truncate_html (0.9.2)
+    twitter_cldr (3.2.1)
+      camertron-eprun
+      cldr-plurals-runtime-rb (~> 1.0.0)
+      json
+      tzinfo
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uuidtools (2.1.5)
     versioncake (2.3.1)
       actionpack (>= 3.2)
       activesupport (>= 3.2)
@@ -283,10 +334,10 @@ DEPENDENCIES
   database_cleaner
   mysql2
   rspec-rails (~> 2.10)
-  sass-rails
-  shoulda-matchers (= 2.6.0)
+  sass-rails (~> 5.0)
+  shoulda-matchers (= 2.2.0)
   simplecov
-  spree (= 2.3.0)
+  spree (~> 3.0.0)
   spree_auth_devise!
   spree_favorite_products!
 

data/README.md

@@ -5,7 +5,7 @@ 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
+3. Favorite Products tab in admin section 
 
 Installation
 ------------
@@ -13,10 +13,25 @@ Installation
 Add spree_favorite_products to your Gemfile:
 
 ```ruby
-gem 'spree_favorite_products', github: "vinsol/spree_favorite_products', branch: '2-3-stable'
+gem 'spree_favorite_products', github: 'vinsol/spree_favorite_products', branch: '3-0-stable'
 ```
 
-This is for Spree version 2.3.  For older versions of spree, use the correct branch.
+For older versions of spree.
+
+```ruby
+# Spree 2.2.x
+gem 'spree_favorite_products', '2.2.3'
+```
+
+```ruby
+# Spree 2.1.x
+gem 'spree_favorite_products', '2.0.3'
+```
+
+```ruby
+# Spree 2.0.x
+gem 'spree_favorite_products', '1.0.0'
+```
 
 Bundle your dependencies and run the installation generator:
 
@@ -43,16 +58,6 @@ Simply add this require statement to your spec_helper:
 require 'spree_favorite_products/factories'
 ```
 
-Thought you should know:
-During the test app build, there will be two warnings that arise due to a habtm issue, see [rails issue #15022](https://github.com/rails/rails/issues/15022)
-
-```shell
-/Users/deft/vendor/bundle/gems/activerecord-4.1.6/lib/active_record/associations.rb:1585: warning: already initialized constant Spree::ShippingMethod::HABTM_Zones
-/Users/deft/vendor/bundle/gems/activerecord-4.1.6/lib/active_record/associations.rb:1585: warning: previous definition of HABTM_Zones was here
-```
-These warnings do not appear to interfere with functionality. Please let me know otherwise.
-
-
 Contributing
 ------------
 

data/app/models/spree/favorite.rb

@@ -1,10 +1,9 @@
 module Spree
   class Favorite < ActiveRecord::Base
     belongs_to :product
-   
     belongs_to :user
     validates :user_id, :product_id, :presence => true
     validates :product_id, :uniqueness => { :scope => :user_id, :message => "already marked as favorite" }
     validates :product, :presence => { :message => "is invalid" }, :if => :product_id
   end
-end
+end

data/app/overrides/add_favorite_products_per_page_configuration.rb

@@ -1,16 +1,15 @@
 Deface::Override.new(
   :virtual_path => 'spree/admin/general_settings/edit',
   :name => 'add_favorite_products_per_page_configuration',
-  :insert_after => "#preferences .row",
+  :insert_before => "#preferences fieldset .form-actions",
   :text => %Q{
     <div class="row">
-      <fieldset class="no-border-bottom">
-        <legend align="center"><%= Spree.t(:favorite_products_settings) %></legend>
-        <div class="field">
-          <%= label_tag :favorite_products_per_page, Spree.t(:favorite_products_per_page) %><br>
+      <div class="col-md-6">
+        <div class="form-group" data-hook="admin_general_setting_favorite_products_per_page">
+          <%= label_tag :favorite_products_per_page, Spree.t(:favorite_products_per_page) %>
           <%= text_field_tag :favorite_products_per_page, Spree::Config[:favorite_products_per_page], :size => 3 %>
         </div>
-      </fieldset>
+      </div>
     </div>
   }
-)
+)

data/app/overrides/add_favorite_products_to_products_tab.rb

@@ -1,11 +1,6 @@
 Deface::Override.new(
-  :virtual_path => 'spree/admin/shared/_tabs',
+  :virtual_path => 'spree/admin/shared/sub_menu/_product',
   :name => 'select_products_tab',
-  :replace => "erb[silent]:contains('if can? :admin, Spree::Product')",
-  :closing_selector => "erb[silent]:contains('end')",
-  :text => %Q{
-    <% if can? :admin, Spree::Product %>
-      <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :favorite_products, :icon => 'icon-th-large' %>
-    <% end %>
-  } 
-)
+  :insert_bottom => "#sidebar-product",
+  :text => %Q{ <%= tab :favorite_products %> }
+)

data/app/views/spree/admin/favorite_products/index.html.erb

@@ -2,12 +2,10 @@
   <%= Spree.t(:listing_favorite_products) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= paginate @favorite_products %>
 
 <% if @favorite_products.any? %>
-  <table class="index" id="listing_products">
+  <table class="table" id="listing_products">
     <colgroup>
        <col style="width: 15%;">
        <col style="width: 10%;">
@@ -43,4 +41,3 @@
 <% end %>
 
 <%= paginate @favorite_products %>
-

data/app/views/spree/admin/favorite_products/users.html.erb

@@ -2,8 +2,6 @@
   <%= Spree.t(:listing_favorite_products_users) %>
 <% end %>
 
-<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
-
 <%= paginate @users %>
 
 <% if @users.any? %>
@@ -29,4 +27,3 @@
 <% end %>
 
 <%= paginate @users %>
-

data/config/locales/en.yml

@@ -2,9 +2,8 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
   spree:
     favorite_products_settings: "Favorite Products Settings"
-    favorite_products_per_page: "Per Page"
+    favorite_products_per_page: "Favorite Products Shown Per Page"
     mark_as_favorite: "Mark as favorite"
     unmark_as_favorite: "Unmark as favorite"

data/spec/controllers/spree/admin/favorite_products_controller_spec.rb

@@ -4,24 +4,27 @@ describe Spree::Admin::FavoriteProductsController do
   let(:role) { Spree::Role.create!(:name => 'user') }
   let(:roles) { [role] }
   let(:product) { mock_model( Spree::Product) }
+  let(:proxy_object) { Object.new }
 
   before(:each) do
     @user = mock_model(Spree::User, :generate_spree_api_key! => false)
-    @user.stub_chain(:roles, :includes).and_return([])
-    @user.stub(:has_spree_role?).with('admin').and_return(true)
-    controller.stub(:spree_user_signed_in?).and_return(true)
-    controller.stub(:spree_current_user).and_return(@user)
-    @user.stub(:roles).and_return(roles)
-    roles.stub(:includes).with(:permissions).and_return(roles)
-    controller.stub(:authorize_admin).and_return(true)
-    controller.stub(:authorize!).and_return(true)
+    allow(@user).to receive(:roles).and_return(proxy_object)
+    allow(proxy_object).to receive(:includes).and_return([])
+
+    allow(@user).to receive(:has_spree_role?).with('admin').and_return(true)
+    allow(controller).to receive(:spree_user_signed_in?).and_return(true)
+    allow(controller).to receive(:spree_current_user).and_return(@user)
+    allow(@user).to receive(:roles).and_return(roles)
+    allow(roles).to receive(:includes).with(:permissions).and_return(roles)
+    allow(controller).to receive(:authorize_admin).and_return(true)
+    allow(controller).to receive(:authorize!).and_return(true)
 
     @favorite_products = double('favorite_products')
-    @favorite_products.stub(:order_by_favorite_users_count).and_return(@favorite_products)
+    allow(@favorite_products).to receive(:order_by_favorite_users_count).and_return(@favorite_products)
     @search = double('search', :result => @favorite_products)
-    @favorite_products.stub(:search).and_return(@search)
-    @favorite_products.stub(:page).and_return(@favorite_products)
-    Spree::Product.stub(:favorite).and_return(@favorite_products)
+    allow(@favorite_products).to receive(:search).and_return(@search)
+    allow(@favorite_products).to receive(:page).and_return(@favorite_products)
+    allow(Spree::Product).to receive(:favorite).and_return(@favorite_products)
   end
 
   describe "GET index" do
@@ -76,10 +79,10 @@ describe Spree::Admin::FavoriteProductsController do
   describe "#users" do
     before do
       @users = [@user]
-      @users.stub(:page).and_return(@users)
-      product.stub(:favorite_users).and_return(@users)
+      allow(@users).to receive(:page).and_return(@users)
+      allow(product).to receive(:favorite_users).and_return(@users)
       @products = [product]
-      Spree::Product.stub(:where).with(:id => product.id).and_return(@products)
+      allow(Spree::Product).to receive(:where).with(:id => product.id).and_return(@products)
     end
 
     def send_request
@@ -100,7 +103,7 @@ describe Spree::Admin::FavoriteProductsController do
   end
 
   describe "#sort_in_ascending_users_count?" do
-    
+
     context 'when favorite_user_count asc present in params[q][s]' do
       it "is true" do
         get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'favorite_users_count asc' }
@@ -111,8 +114,8 @@ describe Spree::Admin::FavoriteProductsController do
     context 'when favorite_user_count not present in params' do
       it "is false" do
         get :index, :page => 1 ,:use_route => 'spree', :q => { 's' => 'name asc' }
-        controller.send(:sort_in_ascending_users_count?).should be_false
+        controller.send(:sort_in_ascending_users_count?).should be false
       end
     end
   end
-end
+end

data/spec/controllers/spree/favorite_products_controller_spec.rb

@@ -2,10 +2,12 @@ require 'spec_helper'
 
 describe Spree::FavoriteProductsController do
 
+  let(:proxy_object) { Object.new }
+
   shared_examples_for "request which requires user authentication" do
     it "authenticates user" do
       controller.should_receive(:authenticate_spree_user!)
-      send_request      
+      send_request
     end
   end
 
@@ -33,15 +35,15 @@ describe Spree::FavoriteProductsController do
 
     before(:each) do
       @favorite = mock_model(Spree::Favorite, :save => true)
-      controller.stub(:authenticate_spree_user!).and_return(true)
-      Spree::Favorite.stub(:new).and_return(@favorite)
+      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)
-      controller.stub(:spree_current_user).and_return(@user)
+      allow(controller).to receive(:spree_current_user).and_return(@user)
     end
 
     it_behaves_like "request which requires user authentication"
 
-      
+
     it "creates favorite" do
       Spree::Favorite.should_receive(:new).with(:product_id => 1)
       send_request
@@ -66,8 +68,9 @@ describe Spree::FavoriteProductsController do
 
     context "when favorite not saved sucessfully" do
       before(:each) do
-        @favorite.stub(:save).and_return(false)
-        @favorite.stub_chain(:errors, :full_messages).and_return(["Product already marked as favorite"])
+        allow(@favorite).to receive(:save).and_return(false)
+        allow(@favorite).to receive(:errors).and_return(proxy_object)
+        allow(proxy_object).to receive(:full_messages).and_return(["Product already marked as favorite"])
       end
 
       it "renders create template" do
@@ -89,12 +92,12 @@ describe Spree::FavoriteProductsController do
 
     before(:each) do
       @favorite_products = double('favorite_products')
-      @favorite_products.stub(:page).and_return(@favorite_products)
-      @favorite_products.stub(:per).and_return(@favorite_products)
-      Spree::Config.stub(:favorite_products_per_page).and_return('favorite_products_per_page')
+      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)
-      controller.stub(:authenticate_spree_user!).and_return(true)
-      controller.stub(:spree_current_user).and_return(@user)
+      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
@@ -131,13 +134,13 @@ describe Spree::FavoriteProductsController do
     before do
       @favorite = mock_model(Spree::Favorite)
       @current_user_favorites = double('spree_favorites')
-      @current_user_favorites.stub(:where).and_return([@favorite])
-      @current_user_favorites.stub(:readonly).and_return(@current_user_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')
-      @favorites.stub(:joins).with(:product).and_return(@current_user_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)
-      controller.stub(:authenticate_spree_user!).and_return(true)
-      controller.stub(:spree_current_user).and_return(@user)
+      allow(controller).to receive(:authenticate_spree_user!).and_return(true)
+      allow(controller).to receive(:spree_current_user).and_return(@user)
     end
 
     it_behaves_like "request which requires user authentication"
@@ -155,18 +158,18 @@ describe Spree::FavoriteProductsController do
 
       context 'when destroyed successfully' do
         before(:each) do
-          @favorite.stub(:destroy).and_return(true)
+          allow(@favorite).to receive(:destroy).and_return(true)
         end
 
         it "sets @success to true" do
           send_request
           assigns(:success).should eq(true)
-        end 
+        end
       end
 
       context 'when not destroyed' do
         before(:each) do
-          @favorite.stub(:destroy).and_return(false)
+          allow(@favorite).to receive(:destroy).and_return(false)
         end
 
         it 'sets @success to false' do
@@ -177,4 +180,4 @@ describe Spree::FavoriteProductsController do
     end
 
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 # Run Coverage report
 require 'simplecov'
+require 'minitest/autorun'
+
 SimpleCov.start do
   add_group 'Controllers', 'app/controllers'
   add_group 'Helpers', 'app/helpers'

data/spree_favorite_products.gemspec

@@ -2,10 +2,10 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_favorite_products'
-  s.version     = '2.3.0'
+  s.version     = '3.0.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 = '>= 1.9.3'
+  s.required_ruby_version = '>= 2.0.0'
 
   s.author    = 'Mohit Bansal'
   s.email     = 'info@vinsol.com'
@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.3.0'
+  s.add_dependency 'spree_core', '~> 3.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_favorite_products
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Mohit Bansal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.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'
@@ -54,7 +54,6 @@ files:
 - app/models/spree/user_decorator.rb
 - app/overrides/.DS_Store
 - app/overrides/add_favorite_products_per_page_configuration.rb
-- app/overrides/add_favorite_products_tab.rb
 - app/overrides/add_favorite_products_to_products_tab.rb
 - app/overrides/add_link_to_mark_product_as_favorite.rb
 - app/overrides/add_link_to_users_favorite_products.rb
@@ -93,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/app/overrides/add_favorite_products_tab.rb

@@ -1,6 +0,0 @@
-Deface::Override.new(
-  :virtual_path => 'spree/admin/shared/_product_sub_menu',
-  :name => 'add_favorite_products_tab',
-  :insert_bottom => "ul#sub_nav",
-  :text => "<%= tab :favorite_products %>"
-)