updates for RSpec 3.0

RailsApps · Jun 4, 2014 · b8d5c62 · b8d5c62
1 parent 9766ec0
commit b8d5c62
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 18 deletions.
diff --git a/.rspec b/.rspec
@@ -1,3 +1,4 @@
 --color
 --format documentation
 --require spec_helper
+--require rails_helper
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -110,7 +110,7 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.1)
       sprockets-rails (~> 2.0)
-    rails_layout (1.0.17)
+    rails_layout (1.0.19)
     railties (4.1.1)
       actionpack (= 4.1.1)
       activesupport (= 4.1.1)

diff --git a/spec/features/users/sign_in_spec.rb b/spec/features/users/sign_in_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 # Feature: Sign in
 #   As a user
 #   I want to sign in

diff --git a/spec/features/users/sign_out_spec.rb b/spec/features/users/sign_out_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 # Feature: Sign out
 #   As a user
 #   I want to sign out

diff --git a/spec/features/users/user_delete_spec.rb b/spec/features/users/user_delete_spec.rb
@@ -1,4 +1,3 @@
-require 'rails_helper'
 include Warden::Test::Helpers
 Warden.test_mode!
 
@@ -16,7 +15,8 @@
   #   Given I am signed in
   #   When I delete my account
   #   Then I should see an account deleted message
-  scenario 'user can delete own account', :slow do
+  scenario 'user can delete own account' do
+    skip 'skip a slow test'
     user = FactoryGirl.create(:user)
     login_as(user, :scope => :user)
     visit edit_user_registration_path(user)

diff --git a/spec/features/users/user_edit_spec.rb b/spec/features/users/user_edit_spec.rb
@@ -1,4 +1,3 @@
-require 'rails_helper'
 include Warden::Test::Helpers
 Warden.test_mode!
 

diff --git a/spec/features/users/user_index_spec.rb b/spec/features/users/user_index_spec.rb
@@ -1,4 +1,3 @@
-require 'rails_helper'
 include Warden::Test::Helpers
 Warden.test_mode!
 

diff --git a/spec/features/users/user_show_spec.rb b/spec/features/users/user_show_spec.rb
@@ -1,4 +1,3 @@
-require 'rails_helper'
 include Warden::Test::Helpers
 Warden.test_mode!
 

diff --git a/spec/features/visitors/home_page_spec.rb b/spec/features/visitors/home_page_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 # Feature: Home page
 #   As a visitor
 #   I want to visit a home page

diff --git a/spec/features/visitors/navigation_spec.rb b/spec/features/visitors/navigation_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 # Feature: Navigation links
 #   As a visitor
 #   I want to see navigation links

diff --git a/spec/features/visitors/sign_up_spec.rb b/spec/features/visitors/sign_up_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 # Feature: Sign up
 #   As a visitor
 #   I want to sign up

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -1,5 +1,3 @@
-require 'rails_helper'
-
 describe User do
 
   before(:each) { @user = User.new(email: '[email protected]') }