Update to latest Ruby, Rails, Rspec

[finishes #101418922, finishes #101418918]

Signed-off-by: Molly T-M <[email protected]>

Author: sidho

.ruby-version

@@ -1 +1 @@
-2.1.5
+2.2.2

Gemfile

@@ -1,6 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.1.5'
-gem 'rails', '4.1.0.rc1'
+gem 'rails', '4.1.9'
 
 gem 'pg'
 gem 'unicorn'
@@ -9,7 +8,7 @@ gem 'omniauth-google-oauth2'
 gem 'github-markdown', require: 'github/markdown'
 gem 'exceptional'
 gem 'protected_attributes'
-gem 'sass-rails'
+gem 'sass-rails', '4.0.3'
 gem 'compass-rails'
 gem 'coffee-rails'
 gem 'uglifier'
@@ -23,7 +22,7 @@ end
 
 group :test, :development do
   gem 'minitest'
-  gem 'rspec-rails', '2.14.0'
+  gem 'rspec-rails', '3.0.0'
   gem 'shoulda-matchers'
   gem 'factory_girl_rails'
   gem 'faker'

Gemfile.lock

@@ -8,35 +8,34 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      mail (~> 2.5.4)
-    actionpack (4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    actionmailer (4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      mail (~> 2.5, >= 2.5.4)
+    actionpack (4.1.9)
+      actionview (= 4.1.9)
+      activesupport (= 4.1.9)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    actionview (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    activemodel (4.1.9)
+      activesupport (= 4.1.9)
       builder (~> 3.1)
-    activerecord (4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    activerecord (4.1.9)
+      activemodel (= 4.1.9)
+      activesupport (= 4.1.9)
       arel (~> 5.0.0)
-    activesupport (4.1.0.rc1)
+    activesupport (4.1.9)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
     addressable (2.3.5)
-    arel (5.0.0)
-    atomic (1.1.15)
+    arel (5.0.1.20140414130214)
     auto_tagger (0.2.11)
       capistrano (>= 2.5.3, <= 2.14.2)
     better_errors (2.1.1)
@@ -119,25 +118,24 @@ GEM
     hashie (3.4.1)
     highline (1.6.21)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.7.0)
     jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.3)
     jwt (1.5.0)
     kgio (2.9.2)
     launchy (2.4.2)
       addressable (~> 2.3)
     letter_opener (1.2.0)
       launchy (~> 2.2)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.3)
+      mime-types (>= 1.16, < 3)
     method_source (0.8.2)
-    mime-types (1.25.1)
+    mime-types (2.6.1)
     mini_portile (0.6.0)
-    minitest (5.3.0)
-    multi_json (1.10.1)
+    minitest (5.8.0)
+    multi_json (1.11.2)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
     net-scp (1.2.0)
@@ -165,7 +163,6 @@ GEM
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
     pg (0.17.1)
-    polyglot (0.3.4)
     protected_attributes (1.0.5)
       activemodel (>= 4.0.1, < 5.0)
     pry (0.10.1)
@@ -174,48 +171,54 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    rack (1.5.2)
-    rack-test (0.6.2)
+    rack (1.5.5)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.0.rc1)
-      actionmailer (= 4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      actionview (= 4.1.0.rc1)
-      activemodel (= 4.1.0.rc1)
-      activerecord (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    rails (4.1.9)
+      actionmailer (= 4.1.9)
+      actionpack (= 4.1.9)
+      actionview (= 4.1.9)
+      activemodel (= 4.1.9)
+      activerecord (= 4.1.9)
+      activesupport (= 4.1.9)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.0.rc1)
-      sprockets-rails (~> 2.0.0)
+      railties (= 4.1.9)
+      sprockets-rails (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
     rails_serve_static_assets (0.0.2)
     rails_stdout_logging (0.0.3)
-    railties (4.1.0.rc1)
-      actionpack (= 4.1.0.rc1)
-      activesupport (= 4.1.0.rc1)
+    railties (4.1.9)
+      actionpack (= 4.1.9)
+      activesupport (= 4.1.9)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.1.1)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    rspec-rails (2.14.0)
+    rake (10.4.2)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
     rubyzip (1.1.6)
-    sass (3.2.14)
-    sass-rails (4.0.1)
+    sass (3.2.19)
+    sass-rails (4.0.3)
       railties (>= 4.0.0, < 5.0)
-      sass (>= 3.1.10)
-      sprockets-rails (~> 2.0.0)
+      sass (~> 3.2.0)
+      sprockets (~> 2.8, <= 2.11.0)
+      sprockets-rails (~> 2.0)
     selenium-webdriver (2.42.0)
       childprocess (>= 0.5.0)
       multi_json (~> 1.0)
@@ -234,19 +237,15 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.0.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    thor (0.18.1)
-    thread_safe (0.2.0)
-      atomic (>= 1.1.7, < 2)
+      sprockets (>= 2.8, < 4.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timecop (0.7.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    tzinfo (1.1.0)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.4.0)
       execjs (>= 0.3.0)
@@ -291,10 +290,10 @@ DEPENDENCIES
   pg
   protected_attributes
   pry-rails
-  rails (= 4.1.0.rc1)
+  rails (= 4.1.9)
   rails_12factor
-  rspec-rails (= 2.14.0)
-  sass-rails
+  rspec-rails (= 3.0.0)
+  sass-rails (= 4.0.3)
   selenium-webdriver
   shoulda-matchers
   timecop

spec/controllers/application_controller_spec.rb

@@ -1,18 +1,17 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe StandupsController do
   it "does not redirect to login if coming from an authorized ip" do
     FactoryGirl.create(:standup, ip_addresses_string: "127.0.0.1/32")
     allow(request).to receive(:remote_ip).and_return('127.0.0.1')
     get :index
-    response.should_not be_redirect
+    expect(response.status).to eq 200
   end
 
   it "requires authentication for invalid IP" do
     FactoryGirl.create(:standup, ip_addresses_string: "127.0.0.1/32")
     allow(request).to receive(:remote_ip).and_return('')
     get :index
-    response.should be_redirect
     expect(response).to redirect_to 'http://test.host/auth/google_oauth2'
   end
 end

spec/controllers/items_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ItemsController do
   let(:standup) { create(:standup) }

spec/controllers/posts_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PostsController do
   let(:standup) { create(:standup) }

spec/controllers/sessions_controller_spec.rb

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

spec/controllers/standups_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe StandupsController do
   let(:standup) { create(:standup) }

spec/features/adding_a_new_face_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "Adding new faces", js: true do
   let!(:standup) { FactoryGirl.create(:standup, ip_addresses_string: "127.0.0.1/32") }

spec/features/items_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "items", type: :request, js: true do
+describe "items", js: true do
   let!(:standup) { FactoryGirl.create(:standup, title: 'San Francisco', subject_prefix: "[Standup][SF]", closing_message: 'Woohoo', image_urls: 'http://example.com/bar.png', image_days: ['Mon']) }
   let!(:other_standup) { FactoryGirl.create(:standup, title: 'New York') }
   let(:timezone) { ActiveSupport::TimeZone.new(standup.time_zone_name) }

spec/features/posts_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "posts", type: :request do
+describe "posts" do
   let!(:standup) { FactoryGirl.create(:standup, title: 'San Francisco') }
 
   describe "archived posts" do

spec/features/publishing_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "publishing", type: :request, js: true do
+describe "publishing", js: true do
   let!(:standup) { FactoryGirl.create(:standup, title: 'Camelot', subject_prefix: "[Standup][CO]") }
 
   before do

spec/features/standups_spec.rb

@@ -1,6 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "standups", type: :request do
+describe "standups" do
   before do
     login
     visit '/'

spec/helpers/application_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ApplicationHelper do
   describe "#pending_post_count" do

spec/mailers/post_mailer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe PostMailer do
   describe 'send_to_all' do

spec/models/blog_post_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe BlogPost do
   describe '#post_hash' do

spec/models/item_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Item do
   let(:item) { build_stubbed(:item) }

spec/models/kind_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Kind do
   before do
@@ -11,4 +11,4 @@
   it "has a subtitle" do
     @kind.subtitle.should == "Things we found that were upsetting"
   end
-end
+end

spec/models/post_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Post do
   describe 'associations' do

spec/models/standup_presenter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'fileutils'
 
 describe StandupPresenter do

spec/models/standup_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Standup do
   describe 'associations' do

spec/models/wordpress_service_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe WordpressService do
   describe "#send!" do