Upgrade to RSpec 3 beta2

Gemfile

@@ -47,13 +47,15 @@ group :development do
 end
 
 group :test do
-  gem 'rspec-rails', '3.0.0.beta1'
-  gem 'fuubar', '>= 1.3.2'
-  # Let bundler find pre-released RSpec 3 depended by fuubar.
-  gem 'rspec', '3.0.0.beta1'
+  gem 'rspec-rails', '>= 3.0.0.beta1'
+  gem 'fuubar', '>= 2.0.0.beta1'
+  gem 'rspec', '>= 3.0.0.beta1'
   gem 'factory_girl_rails'
-  gem 'webrat'
-  gem 'capybara', '>= 2.2.0', require: 'capybara/rspec'  # For RSpec 3
+  gem 'capybara', '>= 2.2.0', require: 'capybara/rspec',
+    # For RSpec 3 beta2
+    # https://github.com/jnicklas/capybara/pull/1219
+    git: 'https://github.com/jnicklas/capybara',
+    ref: 'f18637bf905db7f05a9e9187a30e1cc435fbf593'
   gem 'poltergeist', require: 'capybara/poltergeist'
   gem 'database_rewinder'
   gem 'simplecov'

Gemfile.lock

@@ -1,3 +1,15 @@
+GIT
+  remote: https://github.com/jnicklas/capybara
+  revision: f18637bf905db7f05a9e9187a30e1cc435fbf593
+  ref: f18637bf905db7f05a9e9187a30e1cc435fbf593
+  specs:
+    capybara (2.2.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -55,12 +67,6 @@ GEM
     capistrano-rbenv (2.0.2)
       capistrano (~> 3.1)
       sshkit (~> 1.3)
-    capybara (2.2.1)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
     cliver (0.3.2)
     coderay (1.1.0)
     coffee-rails (4.0.1)
@@ -98,8 +104,8 @@ GEM
     fluent-logger (0.4.9)
       msgpack (>= 0.4.4, < 0.6.0, != 0.5.3, != 0.5.2, != 0.5.1, != 0.5.0)
       yajl-ruby (~> 1.0)
-    fuubar (1.3.2)
-      rspec (>= 2.14.0, < 3.1.0)
+    fuubar (2.0.0.beta1)
+      rspec (~> 3.0.beta)
       ruby-progressbar (~> 1.3)
     hashie (2.1.1)
     hike (1.2.3)
@@ -206,29 +212,30 @@ GEM
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (3.0.0.beta1)
-      rspec-core (= 3.0.0.beta1)
-      rspec-expectations (= 3.0.0.beta1)
-      rspec-mocks (= 3.0.0.beta1)
+    rspec (3.0.0.beta2)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
     rspec-collection_matchers (0.0.4)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.0.0.beta1)
-      rspec-support (= 3.0.0.beta1)
-    rspec-expectations (3.0.0.beta1)
-      diff-lcs (>= 1.1.3, < 2.0)
-      rspec-support (= 3.0.0.beta1)
-    rspec-mocks (3.0.0.beta1)
-      rspec-support (= 3.0.0.beta1)
-    rspec-rails (3.0.0.beta1)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-rails (3.0.0.beta2)
       actionpack (>= 3.0)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-collection_matchers
-      rspec-core (= 3.0.0.beta1)
-      rspec-expectations (= 3.0.0.beta1)
-      rspec-mocks (= 3.0.0.beta1)
-    rspec-support (3.0.0.beta1)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     rubocop (0.21.0)
       json (>= 1.7.7, < 2)
       parser (~> 2.1.9)
@@ -284,7 +291,7 @@ GEM
     thread_safe (0.3.3)
     tilt (1.4.1)
     timecop (0.7.1)
-    tins (1.1.0)
+    tins (1.2.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -301,10 +308,6 @@ GEM
     webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    webrat (0.7.3)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
     websocket-driver (0.3.3)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -321,15 +324,15 @@ DEPENDENCIES
   capistrano-bundler (>= 1.1.2)
   capistrano-rails
   capistrano-rbenv (>= 2.0.0)
-  capybara (>= 2.2.0)
+  capybara (>= 2.2.0)!
   coffee-rails (~> 4.0.0)
   coveralls
   database_rewinder
   factory_girl_rails
   fakeredis
   faraday
   fluent-logger
-  fuubar (>= 1.3.2)
+  fuubar (>= 2.0.0.beta1)
   jbuilder
   jquery-rails
   launchy
@@ -345,8 +348,8 @@ DEPENDENCIES
   rails (= 4.1.1)
   redis
   redis-rails
-  rspec (= 3.0.0.beta1)
-  rspec-rails (= 3.0.0.beta1)
+  rspec (>= 3.0.0.beta1)
+  rspec-rails (>= 3.0.0.beta1)
   rubocop
   sass-rails (~> 4.0.0)
   sdoc
@@ -359,4 +362,3 @@ DEPENDENCIES
   unicorn
   vcr
   webmock
-  webrat

spec/controllers/aoj_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe AojController do
+RSpec.describe AojController do
   let(:user) { FactoryGirl.create(:user) }
   let(:tag1) { FactoryGirl.create(:tag, name: 'abc') }
   let(:tag2) { FactoryGirl.create(:tag, name: 'aba') }

spec/controllers/codeboard_controller_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
-describe CodeboardController do
-
+RSpec.describe CodeboardController do
 end

spec/controllers/contests_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ContestsController do
+RSpec.describe ContestsController do
   let(:users) { 2.times.map { FactoryGirl.create :user } }
   let(:u1) { users[0] }
   let(:u2) { users[1] }

spec/controllers/home_controller_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
-describe HomeController do
-
+RSpec.describe HomeController do
 end

spec/controllers/poj_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe PojController do
+RSpec.describe PojController do
   let(:user) { FactoryGirl.create(:user) }
   let(:tag1) { FactoryGirl.create(:tag, name: 'abc') }
   let(:tag2) { FactoryGirl.create(:tag, name: 'aba') }

spec/controllers/sessions_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe SessionsController do
+RSpec.describe SessionsController do
   describe '#create_user' do
     let(:user_params) do
       {

spec/controllers/tags_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe TagsController do
+RSpec.describe TagsController do
   let(:problem1) { FactoryGirl.create(:poj_problem) }
   let(:problem2) { FactoryGirl.create(:aoj_problem) }
   let(:problem3) { FactoryGirl.create(:poj_problem) }

spec/controllers/users_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe UsersController do
+RSpec.describe UsersController do
   describe '#show' do
     let(:user) { FactoryGirl.create(:user) }
     let(:problem1) { '1000' }

spec/features/activities_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-feature 'Activity' do
-  given(:user1) { FactoryGirl.create(:user) }
-  given(:user2) { FactoryGirl.create(:user) }
+RSpec.describe 'Activity' do
+  let(:user1) { FactoryGirl.create(:user) }
+  let(:user2) { FactoryGirl.create(:user) }
 
-  background do
+  before do
     FactoryGirl.create(:poj_submission_ac, user: user1.poj_user)
     FactoryGirl.create(:aoj_submission_wa, user_id: user2.aoj_user)
     FactoryGirl.create(:contest, owner: user1)
   end
 
-  scenario 'list recent activities' do
+  it 'list recent activities' do
     visit '/activities'
     expect(page).to have_content("#{user1.name} submitted")
     expect(page).to have_link('AC')

spec/features/contest_edit_spec.rb

@@ -1,20 +1,20 @@
 require 'spec_helper'
 
-feature 'Contest edition' do
-  given(:user) { FactoryGirl.create(:twitter_user).user }
-  given!(:contest) { FactoryGirl.create(:contest, name: 'ayakashi') }
-  given!(:poj4000) { FactoryGirl.create(:poj_problem, problem_id: '4000') }
-  given!(:poj3000) { FactoryGirl.create(:poj_problem, problem_id: '3000') }
-  given!(:aoj4000) { FactoryGirl.create(:aoj_problem, problem_id: '4000') }
-
-  background do
+RSpec.describe 'Contest edition' do
+  let(:user) { FactoryGirl.create(:twitter_user).user }
+  let!(:contest) { FactoryGirl.create(:contest, name: 'ayakashi') }
+  let!(:poj4000) { FactoryGirl.create(:poj_problem, problem_id: '4000') }
+  let!(:poj3000) { FactoryGirl.create(:poj_problem, problem_id: '3000') }
+  let!(:aoj4000) { FactoryGirl.create(:aoj_problem, problem_id: '4000') }
+
+  before do
     contest.users << FactoryGirl.create(:twitter_user).user << FactoryGirl.create(:twitter_user).user
     contest.site_problems << poj3000 << aoj4000
 
     login :twitter, user
   end
 
-  scenario 'Update message' do
+  it 'Update message' do
     visit '/'
     click_link contest.name
 
@@ -29,7 +29,7 @@
     expect(page).to have_content("#{user.name} updated contest #{contest.name}")
   end
 
-  scenario 'Add a problem' do
+  it 'Add a problem' do
     visit '/'
     click_link contest.name
 
@@ -48,7 +48,7 @@
     expect(page).to have_content('AOJ 1234')
   end
 
-  scenario 'Add a problem with empty problem_id' do
+  it 'Add a problem with empty problem_id' do
     visit '/'
     click_link contest.name
     click_link 'Edit this contest'
@@ -61,7 +61,7 @@
     expect(page).to have_content('Invalid problem')
   end
 
-  scenario 'Failed to add a problem with non-numeric problem_id' do
+  it 'Failed to add a problem with non-numeric problem_id' do
     visit '/'
     click_link contest.name
     click_link 'Edit this contest'
@@ -74,7 +74,7 @@
     expect(page).to have_content('Invalid problem')
   end
 
-  scenario 'Remove a problem' do
+  it 'Remove a problem' do
     visit '/'
     click_link contest.name
 
@@ -93,7 +93,7 @@
     expect(page).not_to have_content(poj4000.description)
   end
 
-  scenario 'Up-down a problem' do
+  it 'Up-down a problem' do
     contest.site_problems << poj4000
 
     visit '/'

spec/features/contest_spec.rb

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-feature 'Contest' do
-  given(:contest) { FactoryGirl.create(:contest) }
+RSpec.describe 'Contest' do
+  let(:contest) { FactoryGirl.create(:contest) }
 
   context 'with login user' do
-    given(:user) { FactoryGirl.create(:twitter_user).user }
+    let(:user) { FactoryGirl.create(:twitter_user).user }
 
-    background do
+    before do
       login :twitter, user
     end
 
-    scenario 'Create a contest' do
+    it 'Create a contest' do
       new_contest_name = '__CONTEST__'
       click_link 'New contest'
       fill_in 'contest_name', with: new_contest_name
@@ -24,7 +24,7 @@
       expect(page).to have_link(new_contest_name)
     end
 
-    scenario 'Join to and leave a contest' do
+    it 'Join to and leave a contest' do
       visit contest_path(contest)
       within '#content' do
         expect(page).to have_button('Join')
@@ -56,7 +56,7 @@
     end
   end
 
-  scenario 'Reload standing', :js do
+  it 'Reload standing', :js do
     problem = FactoryGirl.create(:poj_problem)
 
     visit contest_path(contest)
@@ -70,14 +70,14 @@
   end
 
   context 'with short reload interval' do
-    given(:interval) { 3.seconds }
+    let(:interval) { 3.seconds }
 
     before do
       ContestsController.class_eval {}  # autoload first
       stub_const('ContestsController::STANDING_RELOAD_INTERVAL', interval)
     end
 
-    scenario 'Automatic standing reload', :js do
+    it 'Automatic standing reload', :js do
       problem = FactoryGirl.create(:poj_problem)
 
       visit contest_path(contest)

spec/features/site_problems_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'Site problem' do
+RSpec.describe 'Site problem' do
   describe 'POJ' do
     let(:site) { 'poj' }
     it_behaves_like 'a site problem page'