Introduce new argument, fix some deprecations, update Capybara

.rspec

@@ -1 +1 @@
---color --format doc
+--color --format doc --require spec_helper

Gemfile.lock

@@ -51,7 +51,7 @@ GEM
       columnize (~> 0.8)
       debugger-linecache (~> 1.2)
     cancan (1.6.10)
-    capybara (2.2.1)
+    capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -178,10 +178,10 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.5.3)
+    mini_portile (0.6.1)
     multi_json (1.9.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     paperclip (4.1.1)
       activemodel (>= 3.0.0)

spec/features/login_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe "Login" do
   before do
     @user = FactoryGirl.create(:user, :password => "mypassword")
@@ -9,7 +7,7 @@
   it "shows the login form when visiting the site", js: true do
     visit root_path
 
-    page.should have_content("Sign In")
+    expect(page).to have_content("Sign In")
   end
 
   it "allows someone to log in and chat", js: true do
@@ -19,8 +17,8 @@
 
     click_button "Sign in"
 
-    page.should have_content(@user.first_name)
-    page.should have_content(@user.last_name)
+    expect(page).to have_content(@user.first_name)
+    expect(page).to have_content(@user.last_name)
 
     using_wait_time(10) do
       expect(page).to have_css('.chat-input')
@@ -31,14 +29,14 @@
     click_button "Post"
 
     within("#channel-activities-1") do
-      page.should have_content("Hello there")
+      expect(page).to have_content("Hello there")
     end
 
     chat_input.set "Hi again"
     click_button "Post"
 
     within("#channel-activities-1") do
-      page.should have_content("Hi again")
+      expect(page).to have_content("Hi again")
     end
   end
 end

spec/models/activity_observer_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe ActivityObserver do
   skip "add some examples to (or delete) #{__FILE__}"
 end

spec/models/activity_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Activity do
   describe "associations" do
     it { should belong_to(:user) }

spec/models/channel_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe Channel do
   describe "associations" do
     it { should have_many(:activities) }

spec/models/user_spec.rb

@@ -1,4 +1,3 @@
-require 'spec_helper'
 require 'cancan/matchers'
 
 describe User do