Bundle update rails, capybara and rspec-rails

leesmith · Nov 15, 2012 · 6ec26ef · 6ec26ef
1 parent 2d72409
commit 6ec26ef
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 64 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,44 +1,44 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.9)
+      actionpack (= 3.2.9)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+    activesupport (3.2.9)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
     arel (3.0.2)
     bcrypt-ruby (3.0.1)
     builder (3.0.4)
-    capybara (1.1.3)
+    capybara (2.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
-      xpath (~> 0.1.4)
+      xpath (~> 1.0.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     chronic (0.8.0)
@@ -88,7 +88,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     nokogiri (1.5.5)
     pg (0.14.1)
     polyglot (0.3.3)
@@ -99,52 +99,51 @@ GEM
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.9)
+      actionmailer (= 3.2.9)
+      actionpack (= 3.2.9)
+      activerecord (= 3.2.9)
+      activeresource (= 3.2.9)
+      activesupport (= 3.2.9)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.9)
+    railties (3.2.9)
+      actionpack (= 3.2.9)
+      activesupport (= 3.2.9)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.1)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    rspec-core (2.12.0)
+    rspec-expectations (2.12.0)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-rails (2.11.4)
+    rspec-mocks (2.12.0)
+    rspec-rails (2.12.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec (~> 2.11.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
     rubyzip (0.9.9)
-    sass (3.2.1)
+    sass (3.2.3)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.25.0)
+    selenium-webdriver (2.26.0)
       childprocess (>= 0.2.5)
       libwebsocket (~> 0.1.3)
       multi_json (~> 1.0)
       rubyzip
     shoulda-matchers (1.4.1)
       activesupport (>= 3.0.0)
-    sprockets (2.1.3)
+    sprockets (2.2.1)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     thin (1.5.0)
@@ -156,11 +155,11 @@ GEM
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
     uglifier (1.3.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
-    xpath (0.1.4)
+    xpath (1.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS

diff --git a/spec/integration/integration_helper.rb → spec/features/features_helper.rb b/spec/integration/integration_helper.rb → spec/features/features_helper.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'capybara/rspec'
 
-# Put integration spec helpers inside /spec/integration/support
+# Put feature spec helpers inside /spec/features/support
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|

diff --git a/spec/integration/support/requests.rb → spec/features/support/requests.rb b/spec/integration/support/requests.rb → spec/features/support/requests.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 def sign_in(user)
   visit sign_in_path

diff --git a/spec/integration/user_registers_spec.rb → spec/features/user_registers_spec.rb b/spec/integration/user_registers_spec.rb → spec/features/user_registers_spec.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 describe 'User registration' do
 
@@ -17,18 +17,18 @@
 
   it 'displays confirmation errors' do
     visit register_path
-    fill_in 'Email', with: 'jack@mail.com'
-    fill_in 'Password', with: 'welcome'
-    fill_in 'Password confirmation', with: 'nomatch'
+    fill_in 'user_email', with: 'jack@mail.com'
+    fill_in 'user_password', with: 'welcome'
+    fill_in 'user_password_confirmation', with: 'nomatch'
     click_button 'Register'
     page.should have_content("Password doesn't match confirmation")
   end
 
   it 'is successful' do
     visit register_path
-    fill_in 'Email', with: 'jack@mail.com'
-    fill_in 'Password', with: 'password'
-    fill_in 'Password confirmation', with: 'password'
+    fill_in 'user_email', with: 'jack@mail.com'
+    fill_in 'user_password', with: 'password'
+    fill_in 'user_password_confirmation', with: 'password'
     click_button 'Register'
     page.should have_content('Thanks for signing up')
     current_path.should == root_path

diff --git a/.../integration/user_resets_password_spec.rb → spec/features/user_resets_password_spec.rb b/.../integration/user_resets_password_spec.rb → spec/features/user_resets_password_spec.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 describe 'User resets password' do
 
@@ -14,15 +14,15 @@
   end
 
   it 'for nonexistent email should have same UX' do
-    fill_in 'Email', with: 'bob.jones@mail.com'
+    fill_in 'email', with: 'bob.jones@mail.com'
     click_button 'Reset Password'
     current_path.should == sign_in_path
     page.should have_content('An email was just sent to you')
     unread_emails_for('bob.jones@mail.com').size.should == 0
   end
 
   it 'successfully' do
-    fill_in 'Email', with: 'sam.adams@mail.com'
+    fill_in 'email', with: 'sam.adams@mail.com'
     click_button 'Reset Password'
     current_path.should == sign_in_path
     page.should have_content('An email was just sent to you')
@@ -32,15 +32,15 @@
     page.should have_content('Change Password')
     click_button 'Change Password'
     page.should have_content("Password can't be blank")
-    fill_in 'Password', with: 'newpassword'
-    fill_in 'Password confirmation', with: 'newpassword'
+    fill_in 'user_password', with: 'newpassword'
+    fill_in 'user_password_confirmation', with: 'newpassword'
     click_button 'Change Password'
     current_path.should == sign_in_path
     page.should have_content('Your password was successfully changed')
   end
 
   it 'unsuccessfully with expired password token' do
-    fill_in 'Email', with: 'sam.adams@mail.com'
+    fill_in 'email', with: 'sam.adams@mail.com'
     click_button 'Reset Password'
     current_path.should == sign_in_path
     page.should have_content('An email was just sent to you')
@@ -49,8 +49,8 @@
     open_email('sam.adams@mail.com')
     click_first_link_in_email
     page.should have_content('Change Password')
-    fill_in 'Password', with: 'newpassword'
-    fill_in 'Password confirmation', with: 'newpassword'
+    fill_in 'user_password', with: 'newpassword'
+    fill_in 'user_password_confirmation', with: 'newpassword'
     click_button 'Change Password'
     current_path.should == new_password_reset_path
     page.should have_content('Password reset has expired')

diff --git a/...ration/user_session_is_remembered_spec.rb → ...atures/user_session_is_remembered_spec.rb b/...ration/user_session_is_remembered_spec.rb → ...atures/user_session_is_remembered_spec.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 describe 'User session is remembered' do
 

diff --git a/spec/integration/user_signs_in_spec.rb → spec/features/user_signs_in_spec.rb b/spec/integration/user_signs_in_spec.rb → spec/features/user_signs_in_spec.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 describe 'User signs in' do
 

diff --git a/spec/integration/user_signs_out_spec.rb → spec/features/user_signs_out_spec.rb b/spec/integration/user_signs_out_spec.rb → spec/features/user_signs_out_spec.rb
@@ -1,4 +1,4 @@
-require 'integration/integration_helper'
+require 'features/features_helper'
 
 describe 'User signs out' do
 

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
@@ -7,7 +7,7 @@
 
   context 'with an existing user' do
     before { Fabricate(:user, email: 'sam.adams@mail.com') }
-    it do
+    specify do
       should validate_uniqueness_of :email
       should_not allow_value('Sam.Adams@mail.com').for(:email)
       should_not allow_value('saM.adaMs@mail.com').for(:email)