Merge pull request #450 from spark-solutions/feature/3-5-release

3.5 release

.travis.yml

@@ -22,7 +22,7 @@ rvm:
 gemfile:
   - gemfiles/spree_3_2.gemfile
   - gemfiles/spree_3_5.gemfile
-  - gemfiles/spree_3_6.gemfile
+  - gemfiles/spree_3_7.gemfile
   - gemfiles/spree_master.gemfile
 
 matrix:

Appraisals

@@ -8,8 +8,8 @@ appraise 'spree-3-5' do
   gem 'rails-controller-testing'
 end
 
-appraise 'spree-3-6' do
-  gem 'spree', '~> 3.6.0'
+appraise 'spree-3-7' do
+  gem 'spree', '~> 3.7.0.rc3'
   gem 'rails-controller-testing'
 end
 

gemfiles/spree_3_6.gemfile → gemfiles/spree_3_7.gemfile

@@ -3,6 +3,6 @@
 source "https://rubygems.org"
 
 gem "rails-controller-testing"
-gem "spree", "~> 3.6.0"
+gem "spree", "~> 3.7.0.rc3"
 
 gemspec path: "../"

spec/controllers/spree/checkout_controller_spec.rb

@@ -67,10 +67,20 @@
       end
 
       context 'with a token' do
-        before { allow(order).to receive(:guest_token) { 'ABC' } }
+        before do
+          if Spree.version.to_f > 3.6
+            allow(order).to receive(:token) { 'ABC' }
+          else
+            allow(order).to receive(:guest_token) { 'ABC' }
+          end
+        end
 
         it 'redirects to the tokenized order view' do
-          request.cookie_jar.signed[:guest_token] = 'ABC'
+          if Spree.version.to_f > 3.6
+            request.cookie_jar.signed[:token] = 'ABC'
+          else
+            request.cookie_jar.signed[:guest_token] = 'ABC'
+          end
           spree_post :update, { state: 'confirm' }
           expect(response).to redirect_to spree.order_path(order)
           expect(flash.notice).to eq Spree.t(:order_processed_successfully)

spec/features/checkout_spec.rb

@@ -31,9 +31,7 @@
 
     scenario 'allow a visitor to checkout as guest, without registration' do
       Spree::Auth::Config.set(registration_step: true)
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
-      within('h1') { expect(page).to have_text 'Shopping Cart' }
+      add_to_cart 'RoR Mug'
       click_button 'Checkout'
 
       expect(page).to have_content(/Checkout as a Guest/i)
@@ -60,13 +58,13 @@
 
     scenario 'associate an uncompleted guest order with user after logging in' do
       user = create(:user, email: '[email protected]', password: 'password', password_confirmation: 'password')
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       fill_in 'Email', with: user.email
       fill_in 'Password', with: user.password
       click_button 'Login'
+      expect(page).to have_text('Cart')
       click_link 'Cart'
 
       expect(page).to have_text 'RoR Mug'
@@ -93,8 +91,7 @@
     scenario 'associate an incomplete guest order with user after successful password reset' do
       create(:store)
       user = create(:user, email: '[email protected]', password: 'password', password_confirmation: 'password')
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       click_link 'Forgot Password?'
@@ -112,7 +109,9 @@
       fill_in 'Password Confirmation', with: 'password'
       click_button 'Update'
 
+      expect(page).to have_text('Cart')
       click_link 'Cart'
+      expect(page).to have_text('RoR Mug')
       click_button 'Checkout'
 
       str_addr = 'bill_address'
@@ -129,8 +128,7 @@
     end
 
     scenario 'allow a user to register during checkout' do
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
       click_button 'Checkout'
 
       expect(page).to have_text 'Registration'

spec/features/order_spec.rb

@@ -17,10 +17,7 @@
     user = create(:user, email: '[email protected]', password: 'password', password_confirmation: 'password')
 
     using_session('first') do
-      visit spree.root_path
-
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Mug'
 
       visit spree.login_path
       fill_in 'Email', with: user.email
@@ -32,10 +29,7 @@
     end
 
     using_session('second') do
-      visit spree.root_path
-
-      click_link 'RoR Shirt'
-      click_button 'Add To Cart'
+      add_to_cart 'RoR Shirt'
 
       visit spree.login_path
       fill_in 'Email', with: user.email

spec/features/sign_out_spec.rb

@@ -31,12 +31,7 @@
     let!(:other_user) { create(:user) }
 
     it 'clears token cookies' do
-      visit spree.root_path
-
-      click_link 'RoR Mug'
-      click_button 'Add To Cart'
-
-      click_link 'Cart'
+      add_to_cart 'RoR Mug'
       expect(page).to have_text 'RoR Mug'
 
       click_link 'Logout'

spec/support/add_to_cart.rb

@@ -0,0 +1,15 @@
+def add_to_cart(product_name)
+  visit spree.root_path
+  click_link product_name
+  if Spree.version.to_f > 3.6
+    expect(page).to have_selector('form#add-to-cart-form')
+    expect(page).to have_selector('button#add-to-cart-button')
+    wait_for_condition do
+      expect(page.find('#add-to-cart-button').disabled?).to eq(false)
+    end
+  end
+  click_button 'Add To Cart'
+  wait_for_condition do
+    expect(page).to have_content(Spree.t(:shopping_cart))
+  end
+end

spree_auth_devise.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_auth_devise'
-  s.version     = '3.4.2'
+  s.version     = '3.5.0'
   s.summary     = 'Provides authentication and authorization services for use with Spree by using Devise and CanCan.'
   s.description = s.summary
 
@@ -29,13 +29,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara', '~> 2.7'
   s.add_development_dependency 'capybara-screenshot'
   s.add_development_dependency 'coffee-rails', '~> 4.2'
+  s.add_development_dependency 'sass-rails'
   s.add_development_dependency 'database_cleaner', '~> 1.5'
   s.add_development_dependency 'email_spec', '~> 2.1'
   s.add_development_dependency 'factory_bot', '~> 4.7'
   s.add_development_dependency 'ffaker'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'mysql2', '~> 0.5.1'
-  s.add_development_dependency 'pg', '~> 0.18'
+  s.add_development_dependency 'mysql2'
+  s.add_development_dependency 'pg'
   s.add_development_dependency 'selenium-webdriver'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'rspec-rails', '~> 3.5'