Fixed deprecated spec methods added explicit feature type

Author: dgra

spec/features/edit_admin_order_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe 'notes on edit admin order page' do
-  before(:each) do
+describe 'notes on edit admin order page', type: :feature do
+  before(:each) do 
     admin_user = create(:admin_user)
-    stub_admin_login! admin_user
+    stub_admin_login!(admin_user)
   end
 
   context 'creating', js: true do
@@ -14,14 +12,14 @@
     end
 
     it 'does not show the create note form initially' do
-      expect(find('.js-create-note-form', visible: false).visible?).to be_false
+      expect(find('.js-create-note-form', visible: false).visible?).to be false
     end
 
     it 'shows the create note form after clicking the create note button' do
       within_fieldset 'admin_order_edit_notes' do
         click_button 'Create New Note'
       end
-      expect(find('.js-create-note-form', visible: false).visible?).to be_true
+      expect(find('.js-create-note-form', visible: false).visible?).to be true
     end
 
     it 'can successfully create an unimportant note' do

spec/features/edit_admin_user_spec.rb

@@ -1,9 +1,7 @@
-require 'spec_helper'
-
-describe 'notes on edit admin user page' do
-  before(:each) do
+describe 'notes on edit admin user page', type: :feature do
+  before(:each) do 
     admin_user = create(:admin_user)
-    stub_admin_login! admin_user
+    stub_admin_login!(admin_user)
   end
 
   context 'creating', js: true do
@@ -14,14 +12,14 @@
     end
 
     it 'does not show the create note form initially' do
-      expect(find('.js-create-note-form', visible: false).visible?).to be_false
+      expect(find('.js-create-note-form', visible: false).visible?).to be false
     end
 
     it 'shows the create note form after clicking the create note button' do
       within_fieldset 'admin_user_edit_notes' do
         click_button 'Create New Note'
       end
-      expect(find('.js-create-note-form', visible: false).visible?).to be_true
+      expect(find('.js-create-note-form', visible: false).visible?).to be true
     end
 
     it 'can successfully create an unimportant note' do

spec/models/spree/notes_spec.rb

@@ -33,21 +33,21 @@
 
     it '.important scope returns only important notes' do
       Spree::Note.important.each do |note|
-        expect(note.important).to be_true
+        expect(note.important).to be true
       end
     end
 
     it '.not_important scope returns only unimportant notes' do
       Spree::Note.not_important.each do |note|
-        expect(note.important).to be_false
+        expect(note.important).to be false
       end
     end
 
     context 'finders always return notes ordered' do
       it 'with important notes first primarily' do
         Spree::Note.all.each_cons(2) do |current_note, next_note|
           if current_note.important != next_note.important
-            expect(next_note.important).to be_false
+            expect(next_note.important).to be false
           end
         end
       end

spec/spec_helper.rb

@@ -13,6 +13,7 @@
 # Testing support from spree_core
 require 'spree/testing_support/factories'
 require 'spree/testing_support/flash'
+require 'spree/testing_support/authorization_helpers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -41,7 +42,7 @@
 
   # Before each spec check if it is a Javascript test and switch between using database transactions or not where necessary.
   config.before :each do
-    DatabaseCleaner.strategy = example.metadata[:js] ? :truncation : :transaction
+    DatabaseCleaner.strategy = RSpec.current_example.metadata[:js] ? :truncation : :transaction
     DatabaseCleaner.start
   end