Use rails_helper

As latest rspec uses rails_helper and spec_helper. So we can follow same convention * Rename fast_spec_helper to spec_helper * Rename spec_helper to rails_helper
vladgogo · Mar 18, 2015 · 0a6a4bd · 0a6a4bd
1 parent 9535367
commit 0a6a4bd
Show file tree

Hide file tree

Showing 68 changed files with 144 additions and 142 deletions.
diff --git a/.rspec b/.rspec
@@ -1 +1,2 @@
 --color
+--require spec_helper
diff --git a/Gemfile b/Gemfile
@@ -45,7 +45,7 @@ group :development, :test do
   gem "jasmine-rails"
   gem "konacha"
   gem "poltergeist"
-  gem "rspec-rails", ">= 2.14"
+  gem "rspec-rails", ">= 3.2"
 end
 
 group :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -128,7 +128,7 @@ GEM
       execjs
       multi_json (>= 1.3)
       rake
-    json (1.8.1)
+    json (1.8.2)
     jwt (1.0.0)
     kgio (2.9.2)
     konacha (3.2.4)
@@ -145,7 +145,7 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
     mini_portile (0.6.2)
-    minitest (5.5.0)
+    minitest (5.5.1)
     mono_logger (1.1.0)
     multi_json (1.10.1)
     multi_xml (0.5.5)
@@ -155,7 +155,7 @@ GEM
       sass (>= 3.3)
     netrc (0.7.7)
     newrelic_rpm (3.9.9.275)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -191,7 +191,7 @@ GEM
     rack (1.6.0)
     rack-protection (1.5.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)
@@ -206,11 +206,11 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_12factor (0.0.2)
       rails_serve_static_assets
@@ -250,22 +250,23 @@ GEM
     rest-client (1.7.2)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-rails (3.2.1)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
     rubocop (0.29.1)
       astrolabe (~> 1.3)
       parser (>= 2.2.0.1, < 3.0)
@@ -313,7 +314,7 @@ GEM
       mime-types (>= 1.25, < 3.0)
       rest-client (~> 1.4)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -374,7 +375,7 @@ DEPENDENCIES
   resque-retry
   resque-sentry
   resque-timeout
-  rspec-rails (>= 2.14)
+  rspec-rails (>= 3.2)
   rubocop (= 0.29.1)
   sass-rails
   scss-lint (= 0.34.0)

diff --git a/spec/controllers/activations_controller_spec.rb b/spec/controllers/activations_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ActivationsController, "#create" do
   context "when activation succeeds" do

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe HomeController, "#index" do
   context "when https is enabled" do

diff --git a/spec/controllers/builds_controller_spec.rb b/spec/controllers/builds_controller_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 describe BuildsController, '#create' do
   it 'ignores confirmation pings' do

diff --git a/spec/controllers/credit_cards_controller_spec.rb b/spec/controllers/credit_cards_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe CreditCardsController, "#update" do
   context "when credit card is updated" do

diff --git a/spec/controllers/deactivations_controller_spec.rb b/spec/controllers/deactivations_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe DeactivationsController, "#create" do
   context "when deactivation succeeds" do

diff --git a/spec/controllers/repo_syncs_controller_spec.rb b/spec/controllers/repo_syncs_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe RepoSyncsController, "#create" do
   context "user is refreshing repos" do

diff --git a/spec/controllers/repos_controller_spec.rb b/spec/controllers/repos_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe ReposController do
   describe "#index" do

diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe SessionsController do
   describe "#create" do

diff --git a/spec/controllers/subscriptions_controller_spec.rb b/spec/controllers/subscriptions_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe SubscriptionsController, "#create" do
   context "when subscription succeeds" do

diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe UsersController do
   describe "#show" do

diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 feature "Account" do
   scenario "user without Stripe Customer ID" do

diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 feature 'Builds' do
   let(:payload) do

diff --git a/spec/features/error_pages_spec.rb b/spec/features/error_pages_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 feature "Error Pages" do
   scenario "user views error page" do

diff --git a/spec/features/public_pages_spec.rb b/spec/features/public_pages_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 feature "Public Pages" do
   context "When a user is not signed in" do

diff --git a/spec/features/repo_list_spec.rb b/spec/features/repo_list_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 feature "Repo list", js: true do
   let(:username) { 'houndci' }

diff --git a/spec/features/user_authentication_spec.rb b/spec/features/user_authentication_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 feature 'User authentication' do
   scenario "existing user signs in" do

diff --git a/spec/helpers/analytics_helper_spec.rb b/spec/helpers/analytics_helper_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 describe AnalyticsHelper, '#analytics?' do
   it "is true when ENV['ANALYTICS'] is present" do

diff --git a/spec/jobs/accept_org_invitations_job_spec.rb b/spec/jobs/accept_org_invitations_job_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe AcceptOrgInvitationsJob do
   it "is retryable" do

diff --git a/spec/jobs/buildable_spec.rb b/spec/jobs/buildable_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "app/jobs/buildable"
 require "app/models/payload"
 require "app/services/build_runner"

diff --git a/spec/jobs/large_build_job_spec.rb b/spec/jobs/large_build_job_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe LargeBuildJob do
   it 'is retryable' do

diff --git a/spec/jobs/repo_synchronization_job_spec.rb b/spec/jobs/repo_synchronization_job_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe RepoSynchronizationJob do
   it "is retryable" do

diff --git a/spec/jobs/small_build_job_spec.rb b/spec/jobs/small_build_job_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe SmallBuildJob do
   it 'is retryable' do

diff --git a/spec/lib/error_message_translation_spec.rb b/spec/lib/error_message_translation_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "lib/error_message_translation"
 
 describe ErrorMessageTranslation do

diff --git a/spec/lib/github_api_spec.rb b/spec/lib/github_api_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "attr_extras"
 require "lib/github_api"
 require "json"

diff --git a/spec/lib/tasks/membership_spec.rb b/spec/lib/tasks/membership_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 require "rake"
 
 describe "namespace membership" do

diff --git a/spec/lib/tasks/repo_spec.rb b/spec/lib/tasks/repo_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 require "rake"
 
 describe "namespace repo" do

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 describe Build do
   it { should belong_to :repo }

diff --git a/spec/models/commit_file_spec.rb b/spec/models/commit_file_spec.rb
@@ -1,6 +1,6 @@
 require "base64"
 
-require "fast_spec_helper"
+require "spec_helper"
 require "app/models/commit_file"
 require "app/models/patch"
 require "app/models/unchanged_line"

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "attr_extras"
 require "octokit"
 require "app/models/commit"

diff --git a/spec/models/default_config_file_spec.rb b/spec/models/default_config_file_spec.rb
@@ -1,5 +1,5 @@
+require "rails_helper"
 require "spec_helper"
-require "fast_spec_helper"
 
 describe DefaultConfigFile do
   describe "#path" do

diff --git a/spec/models/github_team_spec.rb b/spec/models/github_team_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "app/models/github_team"
 
 describe GithubTeam do

diff --git a/spec/models/github_user_spec.rb b/spec/models/github_user_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 describe GithubUser, '#has_admin_access_through_team?' do
   context 'when team is admin team' do

diff --git a/spec/models/membership_spec.rb b/spec/models/membership_spec.rb
@@ -1,4 +1,4 @@
-require 'spec_helper'
+require "rails_helper"
 
 describe Membership, 'associations' do
   it { should belong_to(:repo) }

diff --git a/spec/models/owner_spec.rb b/spec/models/owner_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Owner do
   it { should have_many(:repos) }

diff --git a/spec/models/patch_spec.rb b/spec/models/patch_spec.rb
@@ -1,4 +1,4 @@
-require 'fast_spec_helper'
+require "spec_helper"
 require 'app/models/patch'
 require 'app/models/line'
 

diff --git a/spec/models/payload_spec.rb b/spec/models/payload_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "attr_extras"
 require "app/models/payload"
 require "lib/github_api"

diff --git a/spec/models/payment_gateway_customer_spec.rb b/spec/models/payment_gateway_customer_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe PaymentGatewayCustomer do
   describe "#update_card" do

diff --git a/spec/models/plan_spec.rb b/spec/models/plan_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "app/models/plan"
 
 describe Plan do

diff --git a/spec/models/pull_request_spec.rb b/spec/models/pull_request_spec.rb
@@ -1,4 +1,4 @@
-require "fast_spec_helper"
+require "spec_helper"
 require "app/models/pull_request"
 require "app/models/commit"
 require "lib/github_api"

diff --git a/spec/models/repo_config_spec.rb b/spec/models/repo_config_spec.rb
@@ -1,6 +1,6 @@
 require "attr_extras"
 require "json"
-require "fast_spec_helper"
+require "rails_helper"
 require "app/models/repo_config"
 
 describe RepoConfig do

diff --git a/spec/models/repo_spec.rb b/spec/models/repo_spec.rb
@@ -1,4 +1,4 @@
-require "spec_helper"
+require "rails_helper"
 
 describe Repo do
   it { should have_many :builds }