Update to rspec-rails 3

Closes #4

Author: amatsuda

.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

Gemfile

@@ -48,6 +48,7 @@ group :development do
 end
 
 group :development, :test do
+  gem 'capybara', '>= 2.2'
   gem 'capybara-webkit'
   gem 'database_cleaner'
   gem 'dotenv-rails'

Gemfile.lock

@@ -42,14 +42,14 @@ GEM
     bootstrap-sass (3.0.2.1)
       sass (~> 3.2)
     builder (3.2.2)
-    capybara (2.1.0)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-webkit (1.1.1)
-      capybara (>= 2.0.2, < 2.2.0)
+    capybara-webkit (1.1.0)
+      capybara (~> 2.0, >= 2.0.2)
       json
     celluloid (0.15.2)
       timers (~> 1.1.0)
@@ -290,6 +290,7 @@ DEPENDENCIES
   better_errors
   bootstrap-multiselect-rails (= 0.0.4)
   bootstrap-sass (~> 3.0.2.1)
+  capybara (>= 2.2)
   capybara-webkit
   chartkick
   coderay (~> 1.0)

spec/controllers/comments_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe CommentsController do
+describe CommentsController, type: :controller do
   describe "POST #create" do
     let(:proposal) { build_stubbed(:proposal, uuid: 'abc123') }
     let(:person) { build_stubbed(:person) }

spec/controllers/events_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe EventsController do
+describe EventsController, type: :controller do
   describe 'GET #index' do
     it 'should succeed' do
       get :index

spec/controllers/notifications_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe NotificationsController do
+describe NotificationsController, type: :controller do
   let(:person) { create(:person) }
   before { login(person) }
 

spec/controllers/organizer/participant_invitations_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::ParticipantInvitationsController do
+describe Organizer::ParticipantInvitationsController, type: :controller do
   let(:event) { create(:event) }
   let(:organizer) { create(:organizer, event: event) }
   before { login(organizer) }

spec/controllers/organizer/participants_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::ParticipantsController do
+describe Organizer::ParticipantsController, type: :controller do
   describe 'POST #create' do
     let(:event) { create(:event) }
     let(:organizer_user) { create(:person) }

spec/controllers/organizer/program_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::ProgramController do
+describe Organizer::ProgramController, type: :controller do
   let(:event) { create(:event) }
 
   describe "GET #show" do

spec/controllers/organizer/proposals_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::ProposalsController do
+describe Organizer::ProposalsController, type: :controller do
 
   let(:event) { create(:event) }
   let(:person) do

spec/controllers/organizer/rooms_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::RoomsController do
+describe Organizer::RoomsController, type: :controller do
   let(:event) { create(:event) }
   before { login(create(:organizer, event: event)) }
 

spec/controllers/organizer/schedules_controller_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::SchedulesController do
+describe Organizer::SchedulesController, type: :controller do
 
 end

spec/controllers/organizer/sessions_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::SessionsController do
+describe Organizer::SessionsController, type: :controller do
   let(:event) { create(:event) }
   before { login(create(:organizer, event: event)) }
 

spec/controllers/organizer/speakers_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::SpeakersController do
+describe Organizer::SpeakersController, type: :controller do
   let(:event) { create(:event) }
 
   describe "GET 'speaker_emails'" do

spec/controllers/organizer/tracks_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Organizer::TracksController do
+describe Organizer::TracksController, type: :controller do
   let(:event) { create(:event) }
   before { login(create(:organizer, event: event)) }
 

spec/controllers/participant_invitations_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe ParticipantInvitationsController do
+describe ParticipantInvitationsController, type: :controller do
   let(:invitation) { create(:participant_invitation, role: 'organizer') }
 
   describe "GET 'accept'" do

spec/controllers/profiles_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe ProfilesController do
+describe ProfilesController, type: :controller do
   describe 'PUT #update' do
     let(:user) { create(:person) }
     let(:params) {

spec/controllers/proposals_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe ProposalsController do
+describe ProposalsController, type: :controller do
   let(:event) { create(:event) }
 
   describe 'GET #new' do

spec/controllers/reviewer/proposals_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Reviewer::ProposalsController do
+describe Reviewer::ProposalsController, type: :controller do
 
   let(:proposal) { create(:proposal) }
   let(:event) { proposal.event }

spec/controllers/reviewer/ratings_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe Reviewer::RatingsController do
+describe Reviewer::RatingsController, type: :controller do
   let(:proposal) { create(:proposal) }
   let(:event) { proposal.event }
   let(:reviewer) { create(:person, :reviewer) }

spec/controllers/sessions_controller_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe SessionsController do
+describe SessionsController, type: :controller do
   describe '#create' do
     let(:auth_hash) { double("OmniAuth::AuthHash") }
     let(:user) { build_stubbed(:person) }

spec/decorators/event_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe EventDecorator do
 end

spec/decorators/invitation_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe InvitationDecorator do
 end

spec/decorators/organizer/proposal_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Organizer::ProposalDecorator do
 end

spec/decorators/participant_invitation_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ParticipantInvitationDecorator do
 end

spec/decorators/person_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PersonDecorator do
   describe "#proposal_path" do

spec/decorators/proposal_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 include Proposal::State
 

spec/decorators/reviewer/proposal_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Reviewer::ProposalDecorator do
 end

spec/decorators/session_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SessionDecorator do
   describe '#row_data' do

spec/decorators/sessions_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SessionsDecorator do
 end

spec/decorators/speaker_decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SpeakerDecorator do
 end

spec/features/event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Listing events for different roles" do
   let(:event) { create(:event, state: 'open') }

spec/features/invitation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature 'Speaker Invitations' do
   let(:second_speaker_email) { '[email protected]' }

spec/features/notification_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "User's can interact with notifications" do
   let!(:person) { create(:person) }

spec/features/organizer/event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Event Dashboard" do
   let(:event) { create(:event, name: "My Event") }

spec/features/organizer/participants_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Organizers can manage participants" do
   let(:event) { create(:event) }

spec/features/organizer/program_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Organizers can manage the program" do
 

spec/features/organizer/proposals_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Organizers can manage proposals" do
 

spec/features/participant_invitation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature 'Participant Invitations' do
   let(:user) { create(:person) }

spec/features/profile_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 def select_demographics(args)
   select(args[:gender], from: 'person[gender]')

spec/features/proposal_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Proposals" do
   let(:user) { create(:person) }
@@ -98,7 +98,7 @@
       end
 
       it "marks the proposal as confirmed" do
-        expect(proposal.reload.confirmed?).to be_true
+        expect(proposal.reload.confirmed?).to be_truthy
       end
 
       it "redirects the user to the proposal page" do

spec/features/reviewer/proposal_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "Review Proposals" do
   let(:event) { create(:event, state: 'open') }

spec/helpers/organizer/participant_invitations_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Organizer::ParticipantInvitationsHelper do
 end

spec/helpers/session_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SessionHelper do
 end

spec/mailers/organizer/proposal_mailer_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Organizer::ProposalMailer do
   let(:event) { create(:event) }

spec/mailers/organizer/proposal_mailer_template_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Organizer::ProposalMailerTemplate do
   let(:event) { create(:event) }

spec/mailers/participant_invitation_mailer_spec.rb

@@ -1,6 +1,6 @@
-require "spec_helper"
+require "rails_helper"
 
-describe ParticipantInvitationMailer do
+describe ParticipantInvitationMailer, type: :mailer do
   describe "create" do
     let(:invitation) { create(:participant_invitation) }
     let(:mail) { ParticipantInvitationMailer.create(invitation) }

spec/mailers/proposal_mailer_spec.rb

@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ProposalMailer do
   describe "comment_notification" do

spec/models/event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Event do
   describe "live scope" do
@@ -66,7 +66,7 @@
     second_event = build :event, name: "First"
     expect(first_event).to be_valid
     expect(second_event).to_not be_valid
-    expect(second_event).to have(1).error_on(:slug)
+    expect(second_event.errors[:slug].size).to eq(1)
   end
 
   describe '#valid_proposal_tags=' do

spec/models/invitation_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Invitation do
   describe "#create" do