From 0a6a4bd72a22af9d8465c3e65bf055ca5e0c9448 Mon Sep 17 00:00:00 2001 From: Arun Agrawal Date: Wed, 18 Mar 2015 15:30:09 +0100 Subject: [PATCH] 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 --- .rspec | 1 + Gemfile | 2 +- Gemfile.lock | 47 ++++++++--------- .../activations_controller_spec.rb | 2 +- .../application_controller_spec.rb | 2 +- spec/controllers/builds_controller_spec.rb | 2 +- .../credit_cards_controller_spec.rb | 2 +- .../deactivations_controller_spec.rb | 2 +- .../controllers/repo_syncs_controller_spec.rb | 2 +- spec/controllers/repos_controller_spec.rb | 2 +- spec/controllers/sessions_controller_spec.rb | 2 +- .../subscriptions_controller_spec.rb | 2 +- spec/controllers/users_controller_spec.rb | 2 +- spec/fast_spec_helper.rb | 27 ---------- spec/features/account_spec.rb | 2 +- spec/features/builds_spec.rb | 2 +- spec/features/error_pages_spec.rb | 2 +- spec/features/public_pages_spec.rb | 2 +- spec/features/repo_list_spec.rb | 2 +- spec/features/user_authentication_spec.rb | 2 +- spec/helpers/analytics_helper_spec.rb | 2 +- spec/jobs/accept_org_invitations_job_spec.rb | 2 +- spec/jobs/buildable_spec.rb | 2 +- spec/jobs/large_build_job_spec.rb | 2 +- spec/jobs/repo_synchronization_job_spec.rb | 2 +- spec/jobs/small_build_job_spec.rb | 2 +- spec/lib/error_message_translation_spec.rb | 2 +- spec/lib/github_api_spec.rb | 2 +- spec/lib/tasks/membership_spec.rb | 2 +- spec/lib/tasks/repo_spec.rb | 2 +- spec/models/build_spec.rb | 2 +- spec/models/commit_file_spec.rb | 2 +- spec/models/commit_spec.rb | 2 +- spec/models/default_config_file_spec.rb | 2 +- spec/models/github_team_spec.rb | 2 +- spec/models/github_user_spec.rb | 2 +- spec/models/membership_spec.rb | 2 +- spec/models/owner_spec.rb | 2 +- spec/models/patch_spec.rb | 2 +- spec/models/payload_spec.rb | 2 +- spec/models/payment_gateway_customer_spec.rb | 2 +- spec/models/plan_spec.rb | 2 +- spec/models/pull_request_spec.rb | 2 +- spec/models/repo_config_spec.rb | 2 +- spec/models/repo_spec.rb | 2 +- spec/models/style_checker_spec.rb | 2 +- spec/models/style_config_spec.rb | 2 +- spec/models/style_guide/coffee_script_spec.rb | 2 +- spec/models/style_guide/java_script_spec.rb | 2 +- spec/models/style_guide/ruby_spec.rb | 2 +- spec/models/style_guide/scss_spec.rb | 2 +- spec/models/style_guide/unsupported_spec.rb | 2 +- spec/models/subscription_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/models/violation_spec.rb | 2 +- spec/models/violations_spec.rb | 2 +- spec/policies/commenting_policy_spec.rb | 2 +- spec/rails_helper.rb | 34 +++++++++++++ spec/services/add_hound_to_repo_spec.rb | 2 +- spec/services/build_runner_spec.rb | 2 +- spec/services/commenter_spec.rb | 2 +- spec/services/remove_hound_from_repo_spec.rb | 2 +- spec/services/repo_activator_spec.rb | 2 +- spec/services/repo_subscriber_spec.rb | 2 +- spec/services/repo_synchronization_spec.rb | 2 +- spec/services/update_stripe_metadata_spec.rb | 2 +- spec/spec_helper.rb | 51 ++++++++----------- .../application/_segment_io.haml_spec.rb | 2 +- 68 files changed, 144 insertions(+), 142 deletions(-) delete mode 100644 spec/fast_spec_helper.rb create mode 100644 spec/rails_helper.rb diff --git a/.rspec b/.rspec index 4e1e0d2f7..83e16f804 100644 --- a/.rspec +++ b/.rspec @@ -1 +1,2 @@ --color +--require spec_helper diff --git a/Gemfile b/Gemfile index a8bcf359c..9cfb172c6 100644 --- 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 index 5d1c961d8..722e2727f 100644 --- 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 index 655bfd6ac..e656858ae 100644 --- 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 index 0bcb2d423..f8d1d4173 100644 --- 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 index 7606efc99..af5e782e1 100644 --- 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 index 8c862268a..5722b6776 100644 --- 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 index b54b557a5..220fac129 100644 --- 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 index b86abe2b7..1995bf9af 100644 --- 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 index 426b368db..c2df561ee 100644 --- 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 index c6d187fab..c6043dfd1 100644 --- 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 index f713afd47..4ae5dd1e2 100644 --- 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 index 95c4a1d72..4fb0e4845 100644 --- 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 deleted file mode 100644 index 8a4a0623d..000000000 --- a/spec/fast_spec_helper.rb +++ /dev/null @@ -1,27 +0,0 @@ -$: << File.expand_path("../..", __FILE__) - -require "attr_extras" -require "byebug" -require "webmock/rspec" -require "active_support" -require "active_support/core_ext" - -Dir["spec/support/**/*.rb"].each { |f| require f } - -ENV["HOST"] = "test.host" -ENV["SECRET_KEY_BASE"] = "test-key" -ENV["HOUND_GITHUB_USERNAME"] = "houndci" -ENV["HOUND_GITHUB_TOKEN"] = "houndgithubtoken" -ENV["ENABLE_HTTPS"] = "no" -ENV["CHANGED_FILES_THRESHOLD"] = "300" -ENV["MAX_COMMENTS"] = "10" -ENV["STRIPE_API_KEY"] = "sk_test_123" -ENV["STRIPE_PUBLISHABLE_KEY"] = "pk_test_123" -ENV["EXEMPT_ORGS"] = "thoughtbot,billybob" - -RSpec.configure do |config| - config.order = "random" - config.include GithubApiHelper - config.include StripeApiHelper - WebMock.disable_net_connect!(allow_localhost: true) -end diff --git a/spec/features/account_spec.rb b/spec/features/account_spec.rb index e1033e21b..c36891bda 100644 --- 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 index 8eed9a562..35dd61557 100644 --- 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 index d54f5af8b..3b633b8f8 100644 --- 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 index 392f08f58..1a451a039 100644 --- 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 index 0d2c86570..de23afd4f 100644 --- 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 index 024aec20d..bbde157f7 100644 --- 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 index 6fe065064..5d2f6cd8b 100644 --- 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 index 0b9e8a0ce..d9b6d9910 100644 --- 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 index d785ba295..009773397 100644 --- 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 index 3ab5c990a..4f49f12ad 100644 --- 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 index b7ca34c34..23c929236 100644 --- 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 index b21d9d649..6b900397a 100644 --- 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 index 9782cc842..aeb8749af 100644 --- 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 index bcb0561c1..686285f6f 100644 --- 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 index be44f736a..83429e190 100644 --- 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 index f3af50468..a41749aef 100644 --- 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 index 391df036a..f8de39610 100644 --- 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 index 0e2e46890..e1376676b 100644 --- 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 index 8611cfb80..031303eb4 100644 --- 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 index ce68dab9a..9f4300010 100644 --- 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 index 9cd25c3d4..f13b6a059 100644 --- 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 index 462b94635..2b9d9d2be 100644 --- 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 index 3d41d1efb..16d74420c 100644 --- 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 index 9d4c8311a..496a391ae 100644 --- 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 index f8c00b880..6fb749dae 100644 --- 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 index 0ebf359c5..af4265a44 100644 --- 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 index 59c3cc992..280dde800 100644 --- 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 index d2aa37a9e..1c41bb834 100644 --- 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 index 59be1e54d..a413bfa60 100644 --- 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 index 728e23363..e6091c87a 100644 --- 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 index b8e331dfd..41a765a89 100644 --- 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 } diff --git a/spec/models/style_checker_spec.rb b/spec/models/style_checker_spec.rb index 3016ad757..a95b367c3 100644 --- a/spec/models/style_checker_spec.rb +++ b/spec/models/style_checker_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleChecker, "#violations" do it "returns a collection of computed violations" do diff --git a/spec/models/style_config_spec.rb b/spec/models/style_config_spec.rb index cb398175b..bec846a43 100644 --- a/spec/models/style_config_spec.rb +++ b/spec/models/style_config_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleConfig do it { should belong_to(:owner) } diff --git a/spec/models/style_guide/coffee_script_spec.rb b/spec/models/style_guide/coffee_script_spec.rb index 32f7d3600..20a40a747 100644 --- a/spec/models/style_guide/coffee_script_spec.rb +++ b/spec/models/style_guide/coffee_script_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleGuide::CoffeeScript do include ConfigurationHelper diff --git a/spec/models/style_guide/java_script_spec.rb b/spec/models/style_guide/java_script_spec.rb index c8b7e11e7..2d509cc61 100644 --- a/spec/models/style_guide/java_script_spec.rb +++ b/spec/models/style_guide/java_script_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleGuide::JavaScript do include ConfigurationHelper diff --git a/spec/models/style_guide/ruby_spec.rb b/spec/models/style_guide/ruby_spec.rb index b613aea3e..79f54f9df 100644 --- a/spec/models/style_guide/ruby_spec.rb +++ b/spec/models/style_guide/ruby_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleGuide::Ruby, "#violations_in_file" do include ConfigurationHelper diff --git a/spec/models/style_guide/scss_spec.rb b/spec/models/style_guide/scss_spec.rb index 826c047cf..3be35ba07 100644 --- a/spec/models/style_guide/scss_spec.rb +++ b/spec/models/style_guide/scss_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe StyleGuide::Scss do describe "#violations_in_file" do diff --git a/spec/models/style_guide/unsupported_spec.rb b/spec/models/style_guide/unsupported_spec.rb index 3f078ad4d..04ac02f8f 100644 --- a/spec/models/style_guide/unsupported_spec.rb +++ b/spec/models/style_guide/unsupported_spec.rb @@ -1,5 +1,5 @@ require "attr_extras" -require "fast_spec_helper" +require "rails_helper" require "app/models/style_guide/base" require "app/models/style_guide/unsupported" diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb index 0647ad67d..6e99eb35f 100644 --- a/spec/models/subscription_spec.rb +++ b/spec/models/subscription_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Subscription do context "when creating a duplicate subscription for a repo" do diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 29dabd6b2..9e13430c5 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require "rails_helper" describe User do it { should have_many(:repos).through(:memberships) } diff --git a/spec/models/violation_spec.rb b/spec/models/violation_spec.rb index 3d9dbba6b..55e8949ec 100644 --- a/spec/models/violation_spec.rb +++ b/spec/models/violation_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Violation do it { should belong_to(:build) } diff --git a/spec/models/violations_spec.rb b/spec/models/violations_spec.rb index c6cb7653c..f7982d38b 100644 --- a/spec/models/violations_spec.rb +++ b/spec/models/violations_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe Violations do describe "#push" do diff --git a/spec/policies/commenting_policy_spec.rb b/spec/policies/commenting_policy_spec.rb index 27c91db08..5cf0d5bf4 100644 --- a/spec/policies/commenting_policy_spec.rb +++ b/spec/policies/commenting_policy_spec.rb @@ -1,5 +1,5 @@ require "attr_extras" -require "fast_spec_helper" +require "rails_helper" require "app/policies/commenting_policy" describe CommentingPolicy do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb new file mode 100644 index 000000000..d5cd46f00 --- /dev/null +++ b/spec/rails_helper.rb @@ -0,0 +1,34 @@ +ENV["RAILS_ENV"] ||= "test" + +require "rails_helper" +require "config/environment" +require "rspec/rails" + +ActiveRecord::Migration.maintain_test_schema! + +RSpec.configure do |config| + Analytics.backend = FakeAnalyticsRuby.new + + config.before do + DatabaseCleaner.clean + end + + config.infer_base_class_for_anonymous_controllers = false + config.infer_spec_type_from_file_location! + config.include AnalyticsHelper + config.include AuthenticationHelper + config.include Features, type: :feature + config.include HttpsHelper + config.include OauthHelper + config.include FactoryGirl::Syntax::Methods + DatabaseCleaner.strategy = :deletion +end + +Capybara.configure do |config| + config.javascript_driver = :webkit + config.default_wait_time = 4 +end + +OmniAuth.configure do |config| + config.test_mode = true +end diff --git a/spec/services/add_hound_to_repo_spec.rb b/spec/services/add_hound_to_repo_spec.rb index 923ea465f..714ef19e5 100644 --- a/spec/services/add_hound_to_repo_spec.rb +++ b/spec/services/add_hound_to_repo_spec.rb @@ -1,4 +1,4 @@ -require "fast_spec_helper" +require "rails_helper" require "app/services/manage_hound" require "app/services/add_hound_to_repo" require "app/models/github_user" diff --git a/spec/services/build_runner_spec.rb b/spec/services/build_runner_spec.rb index 9b8030de0..48ce0bad7 100644 --- a/spec/services/build_runner_spec.rb +++ b/spec/services/build_runner_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require "rails_helper" describe BuildRunner, '#run' do context 'with active repo and opened pull request' do diff --git a/spec/services/commenter_spec.rb b/spec/services/commenter_spec.rb index b3226fcba..f470f15b1 100644 --- a/spec/services/commenter_spec.rb +++ b/spec/services/commenter_spec.rb @@ -1,4 +1,4 @@ -require 'fast_spec_helper' +require "rails_helper" require 'app/services/commenter' require 'app/policies/commenting_policy' diff --git a/spec/services/remove_hound_from_repo_spec.rb b/spec/services/remove_hound_from_repo_spec.rb index e781fbc96..76b5a1637 100644 --- a/spec/services/remove_hound_from_repo_spec.rb +++ b/spec/services/remove_hound_from_repo_spec.rb @@ -1,4 +1,4 @@ -require "fast_spec_helper" +require "rails_helper" require "app/services/manage_hound" require "app/services/remove_hound_from_repo" diff --git a/spec/services/repo_activator_spec.rb b/spec/services/repo_activator_spec.rb index 084fd94c0..a5df476f6 100644 --- a/spec/services/repo_activator_spec.rb +++ b/spec/services/repo_activator_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe RepoActivator do describe "#activate" do diff --git a/spec/services/repo_subscriber_spec.rb b/spec/services/repo_subscriber_spec.rb index 692c215dc..547d4be43 100644 --- a/spec/services/repo_subscriber_spec.rb +++ b/spec/services/repo_subscriber_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe RepoSubscriber do describe ".subscribe" do diff --git a/spec/services/repo_synchronization_spec.rb b/spec/services/repo_synchronization_spec.rb index 99cef95d1..869e11896 100644 --- a/spec/services/repo_synchronization_spec.rb +++ b/spec/services/repo_synchronization_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe RepoSynchronization do describe "#start" do diff --git a/spec/services/update_stripe_metadata_spec.rb b/spec/services/update_stripe_metadata_spec.rb index 7d1da9fa3..b390e3c71 100644 --- a/spec/services/update_stripe_metadata_spec.rb +++ b/spec/services/update_stripe_metadata_spec.rb @@ -1,4 +1,4 @@ -require "spec_helper" +require "rails_helper" describe UpdateStripeMetadata do describe "#run" do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 0228abfda..8a4a0623d 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,34 +1,27 @@ -ENV['RAILS_ENV'] ||= 'test' +$: << File.expand_path("../..", __FILE__) -require 'fast_spec_helper' -require 'config/environment' -require 'rspec/rails' +require "attr_extras" +require "byebug" +require "webmock/rspec" +require "active_support" +require "active_support/core_ext" -ActiveRecord::Migration.maintain_test_schema! +Dir["spec/support/**/*.rb"].each { |f| require f } -RSpec.configure do |config| - Analytics.backend = FakeAnalyticsRuby.new - - config.before do - DatabaseCleaner.clean - end - - config.infer_base_class_for_anonymous_controllers = false - config.infer_spec_type_from_file_location! - config.include AnalyticsHelper - config.include AuthenticationHelper - config.include Features, type: :feature - config.include HttpsHelper - config.include OauthHelper - config.include FactoryGirl::Syntax::Methods - DatabaseCleaner.strategy = :deletion -end +ENV["HOST"] = "test.host" +ENV["SECRET_KEY_BASE"] = "test-key" +ENV["HOUND_GITHUB_USERNAME"] = "houndci" +ENV["HOUND_GITHUB_TOKEN"] = "houndgithubtoken" +ENV["ENABLE_HTTPS"] = "no" +ENV["CHANGED_FILES_THRESHOLD"] = "300" +ENV["MAX_COMMENTS"] = "10" +ENV["STRIPE_API_KEY"] = "sk_test_123" +ENV["STRIPE_PUBLISHABLE_KEY"] = "pk_test_123" +ENV["EXEMPT_ORGS"] = "thoughtbot,billybob" -Capybara.configure do |config| - config.javascript_driver = :webkit - config.default_wait_time = 4 -end - -OmniAuth.configure do |config| - config.test_mode = true +RSpec.configure do |config| + config.order = "random" + config.include GithubApiHelper + config.include StripeApiHelper + WebMock.disable_net_connect!(allow_localhost: true) end diff --git a/spec/views/application/_segment_io.haml_spec.rb b/spec/views/application/_segment_io.haml_spec.rb index 61b7cda93..7a6a24678 100644 --- a/spec/views/application/_segment_io.haml_spec.rb +++ b/spec/views/application/_segment_io.haml_spec.rb @@ -1,4 +1,4 @@ -require 'spec_helper' +require "rails_helper" describe 'application/_segment_io.haml' do before do