Merge pull request #249 from solidusio/rainerd/fix-logout-test-post-navbar-update

Fix failing spec for admin logout

Author: rainerdema

config/initializers/warden.rb

@@ -4,7 +4,7 @@
 Warden::Manager.after_set_user except: :fetch do |user, auth, _opts|
   if auth.cookies.signed[:guest_token].present?
     if user.is_a?(Spree::User)
-      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).each do |order|
+      Spree::Order.incomplete.where(guest_token: auth.cookies.signed[:guest_token], user_id: nil).find_each do |order|
         order.associate_user!(user)
       end
     end

spec/features/admin/sign_out_spec.rb

@@ -15,9 +15,28 @@
   end
 
   scenario 'allows a signed in user to logout' do
-    click_link 'Logout'
+    click_logout_link
     visit spree.admin_login_path
     expect(page).to have_text 'Login'
     expect(page).not_to have_text 'Logout'
   end
+
+  def click_logout_link
+    new_version? ? logout_new_version : logout_old_version
+  end
+
+  def new_version?
+    Gem::Requirement.new('>= 4.2').satisfied_by?(Spree.solidus_gem_version)
+  end
+
+  def logout_new_version
+    find('details div', text: user.email, wait: 10).click
+    within('details') do
+      click_link 'Logout'
+    end
+  end
+
+  def logout_old_version
+    click_link 'Logout'
+  end
 end