From b13162cd1d96c80389cc59ba2e2ee4a49f11af2c Mon Sep 17 00:00:00 2001
From: Arthur Neves <arthurnn@gmail.com>
Date: Sun, 22 Feb 2015 23:16:43 -0500
Subject: [PATCH] Remove rspec rails_helper

---
 spec/helpers/application_helper_spec.rb | 13 -------------
 spec/rails_helper.rb                    | 38 --------------------------------------
 spec/spec_helper.rb                     |  2 ++
 3 files changed, 2 insertions(+), 51 deletions(-)
 delete mode 100644 spec/rails_helper.rb

diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index ca5d063..9550b0b 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -1,16 +1,3 @@
-require 'rails_helper'
-
-# Specs in this file have access to a helper object that includes
-# the AbcHelper. For example:
-#
-# describe AbcHelper do
-#   describe "string concat" do
-#     it "concats two strings with spaces" do
-#       helper.concat_strings("this","that").should == "this that"
-#     end
-#   end
-# end
-
 describe ApplicationHelper do
   let(:notice) { Fabricate(:notice) }
   describe "#generate_problem_ical" do
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
deleted file mode 100644
index 826c753..0000000
--- a/spec/rails_helper.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
-ENV["RAILS_ENV"] ||= 'test'
-require 'spec_helper'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-# Add additional requires below this line. Rails is not loaded until this point!
-
-# Requires supporting ruby files with custom matchers and macros, etc, in
-# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-#
-# The following line is provided for convenience purposes. It has the downside
-# of increasing the boot-up time by auto-requiring all files in the support
-# directory. Alternatively, in the individual `*_spec.rb` files, manually
-# require only the support files necessary.
-#
-# Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-RSpec.configure do |config|
-  # RSpec Rails can automatically mix in different behaviours to your tests
-  # based on their file location, for example enabling you to call `get` and
-  # `post` in specs under `spec/controllers`.
-  #
-  # You can disable this behaviour by removing the line below, and instead
-  # explicitly tag your specs with their type, e.g.:
-  #
-  #     RSpec.describe UsersController, :type => :controller do
-  #       # ...
-  #     end
-  #
-  # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/docs
-  config.infer_spec_type_from_file_location!
-end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c2a77cf..3ff9263 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -47,6 +47,8 @@ RSpec.configure do |config|
   config.before(:each, type: :helper) do |_|
     init_haml_helpers
   end
+
+  config.infer_spec_type_from_file_location!
 end
 
 OmniAuth.config.test_mode = true
--
libgit2 0.21.2