require spec_helper in .rspec

closes #7223

.rspec

@@ -3,3 +3,4 @@
 --color
 --tag ~performance
 --order random
+--require spec_helper

Changelog.md

@@ -11,6 +11,7 @@
 * Refactor flash messages on ajax errors for comments, likes, reshares and aspect memberships [#7202](https://github.com/diaspora/diaspora/pull/7202)
 * Only require AWS-module for fog [#7201](https://github.com/diaspora/diaspora/pull/7201)
 * Only show community spotlight links on the contacts page if community spotlight is enabled [#7213](https://github.com/diaspora/diaspora/pull/7213)
+* Require spec\_helper in .rspec [#7223](https://github.com/diaspora/diaspora/pull/7223)
 
 ## Bug fixes
 * Fix fetching comments after fetching likes [#7167](https://github.com/diaspora/diaspora/pull/7167)

spec/configuration_methods_spec.rb

-require "spec_helper"
-
 describe "ensure configuration effects" do
   it "sets the captcha length as required" do
     expect(SimpleCaptcha.length).to eq(AppConfig.settings.captcha.captcha_length.to_i)

spec/controllers/admin/pods_controller_spec.rb

-
-require "spec_helper"
-
 describe Admin::PodsController, type: :controller do
   before do
     @user = FactoryGirl.create :user

spec/controllers/admin/users_controller_spec.rb

-
-require 'spec_helper'
-
 describe Admin::UsersController, :type => :controller do
   before do
     @user = FactoryGirl.create :user

spec/controllers/admins_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe AdminsController, :type => :controller do
   before do
     @user = FactoryGirl.create :user

spec/controllers/api/openid_connect/authorizations_controller_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::AuthorizationsController, type: :controller do
   let!(:client) { FactoryGirl.create(:o_auth_application) }
   let!(:client_with_xss) { FactoryGirl.create(:o_auth_application_with_xss) }

spec/controllers/api/openid_connect/clients_controller_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf_verification: :none do
   describe "#create" do
     context "when valid parameters are passed" do

spec/controllers/api/openid_connect/discovery_controller_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::DiscoveryController, type: :controller do
   describe "#webfinger" do
     before do

spec/controllers/api/openid_connect/id_tokens_controller_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::IdTokensController, type: :controller do
   describe "#jwks" do
     before do

spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::TokenEndpointController, type: :controller, suppress_csrf_verification: :none do
   let(:auth) { FactoryGirl.create(:auth_with_read) }
 

spec/controllers/api/openid_connect/user_applications_spec.rb

-require "spec_helper"
-
 describe Api::OpenidConnect::UserApplicationsController, type: :controller do
   before do
     @app = FactoryGirl.create(:o_auth_application_with_xss)

spec/controllers/application_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ApplicationController, :type => :controller do
   controller do
     def index

spec/controllers/aspect_memberships_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe AspectMembershipsController, type: :controller do
   before do
     @aspect0  = alice.aspects.first

spec/controllers/aspects_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe AspectsController, :type => :controller do
   before do
     alice.getting_started = false

spec/controllers/blocks_controller_spec.rb

-require 'spec_helper'
-
 describe BlocksController, :type => :controller do
   before do
     sign_in alice

spec/controllers/comments_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe CommentsController, :type => :controller do
   before do
     allow(@controller).to receive(:current_user).and_return(alice)

spec/controllers/contacts_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ContactsController, :type => :controller do
   before do
     sign_in bob, scope: :user

spec/controllers/conversation_visibilities_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ConversationVisibilitiesController, :type => :controller do
   before do
     @user1 = alice

spec/controllers/conversations_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ConversationsController, :type => :controller do
   before do
     sign_in alice, scope: :user

spec/controllers/help_controller_spec.rb

-require "spec_helper"
-
 describe HelpController, type: :controller do
   describe "#faq" do
     it "succeeds" do

spec/controllers/home_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe HomeController, type: :controller do
   describe "#show" do
     it "does not redirect for :html if there are at least 2 users and an admin" do

spec/controllers/invitation_codes_controller_spec.rb

-require "spec_helper"
-
 describe InvitationCodesController, type: :controller do
   describe "#show" do
     it "redirects to the root page if the invitation code is invalid" do

spec/controllers/invitations_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe InvitationsController, type: :controller do
   describe "#create" do
     let(:referer) { "http://test.host/cats/foo" }

spec/controllers/jasmine_fixtures/admins_spec.rb

-require "spec_helper"
-
 describe AdminsController, type: :controller do
   describe "#dashboard" do
     before do

spec/controllers/jasmine_fixtures/aspects_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe StreamsController, :type => :controller do
   describe '#aspects' do
     before do

spec/controllers/jasmine_fixtures/contacts_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ContactsController, :type => :controller do
   describe '#index' do
     before do

spec/controllers/jasmine_fixtures/conversations_spec.rb

-require 'spec_helper'
-
 describe ConversationsController, :type => :controller do
   describe '#index' do
     before do

spec/controllers/jasmine_fixtures/notifications_spec.rb

-require 'spec_helper'
-
 describe NotificationsController, :type => :controller do
   describe '#index' do
     before do

spec/controllers/jasmine_fixtures/people_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PeopleController, :type => :controller do
   describe '#index' do
     before do

spec/controllers/jasmine_fixtures/photos_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PhotosController, :type => :controller do
   before do
     @alices_photo = alice.post(:photo, :user_file => uploaded_photo, :to => alice.aspects.first.id, :public => false)

spec/controllers/jasmine_fixtures/status_messages_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe StatusMessagesController, :type => :controller do
   describe '#bookmarklet' do
     before do

spec/controllers/jasmine_fixtures/streams_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe StreamsController, :type => :controller do
   describe '#multi' do
     before do

spec/controllers/jasmine_fixtures/users_spec.rb

-require "spec_helper"
-
 describe UsersController, type: :controller do
   before do
     sign_in alice, scope: :user

spec/controllers/likes_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe LikesController, :type => :controller do
   before do
     @alices_aspect = alice.aspects.where(:name => "generic").first

spec/controllers/messages_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe MessagesController, :type => :controller do
   before do
     sign_in(alice, scope: :user)

spec/controllers/node_info_controller_spec.rb

-require "spec_helper"
-
 describe NodeInfoController do
   describe "#jrd" do
     it "responds to JSON" do

spec/controllers/notifications_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe NotificationsController, :type => :controller do
   before do
     sign_in alice, scope: :user

spec/controllers/participations_controller_spec.rb

-require 'spec_helper'
-
 describe ParticipationsController, :type => :controller do
   before do
     allow(@controller).to receive(:current_user).and_return(alice)

spec/controllers/passwords_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe Devise::PasswordsController, type: :controller do
   before do
     @request.env["devise.mapping"] = Devise.mappings[:user]

spec/controllers/people_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PeopleController, :type => :controller do
   include_context :gon
 

spec/controllers/photos_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PhotosController, :type => :controller do
   before do
     @alices_photo = alice.post(:photo, :user_file => uploaded_photo, :to => alice.aspects.first.id, :public => false)

spec/controllers/posts_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe PostsController, type: :controller do
   let(:post) { alice.post(:status_message, text: "ohai", to: alice.aspects.first) }
 

spec/controllers/profiles_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ProfilesController, :type => :controller do
   before do
     sign_in eve, scope: :user

spec/controllers/registrations_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe RegistrationsController, type: :controller do
   before do
     request.env["devise.mapping"] = Devise.mappings[:user]

spec/controllers/report_controller_spec.rb

-
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe ReportController, type: :controller do
   before do
     sign_in alice

spec/controllers/reshares_controller_spec.rb

-require 'spec_helper'
-
 describe ResharesController, :type => :controller do
   describe '#create' do
     let(:post_request!) {

spec/controllers/search_controller_spec.rb

-require 'spec_helper'
-
 describe SearchController, :type => :controller do
   before do
     @user = alice

spec/controllers/services_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ServicesController, :type => :controller do
   let(:omniauth_auth) do
     { 'provider' => 'facebook',

spec/controllers/sessions_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe SessionsController, type: :controller do
   let(:mock_access_token) { Object.new }
 

spec/controllers/share_visibilities_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ShareVisibilitiesController, :type => :controller do
   before do
     @status = alice.post(:status_message, :text => "hello", :to => alice.aspects.first)

spec/controllers/social_relay_controller_spec.rb

-require "spec_helper"
-
 describe SocialRelayController, type: :controller do
   describe "#well_known" do
     it "responds to format json" do

spec/controllers/status_messages_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe StatusMessagesController, :type => :controller do
   before do
     @aspect1 = alice.aspects.first

spec/controllers/streams_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe StreamsController, :type => :controller do
   before do
     sign_in alice

spec/controllers/tag_followings_controller_spec.rb

-require "spec_helper"
-
 describe TagFollowingsController, type: :controller do
   describe "#manage" do
     context "not signed in" do

spec/controllers/tags_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe TagsController, :type => :controller do
   describe '#index (search)' do
     before do

spec/controllers/terms_controller_spec.rb

-require "spec_helper"
-
 describe TermsController, type: :controller do
   describe "#index" do
     it "succeeds" do

spec/controllers/users_controller_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe UsersController, :type => :controller do
   include_context :gon
 

spec/federation_callbacks_spec.rb

-require "spec_helper"
 require "diaspora_federation/test"
 
 describe "diaspora federation callbacks" do

spec/helpers/application_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe ApplicationHelper, :type => :helper do
   before do
     @user = alice

spec/helpers/conversations_helper_spec.rb

-require 'spec_helper'
-
 describe ConversationsHelper, :type => :helper do
   before do
     @conversation = FactoryGirl.create(:conversation)

spec/helpers/getting_started_helper_spec.rb

 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-require 'spec_helper'
 
 describe GettingStartedHelper, :type => :helper do
   before do

spec/helpers/gon_helper_spec.rb

-require "spec_helper"
-
 describe GonHelper, type: :helper do
   include_context :gon
 

spec/helpers/interim_stream_hackiness_helper_spec.rb

-require 'spec_helper'
-
 describe InterimStreamHackinessHelper, type: :helper do
   describe "commenting_disabled?" do
     include Devise::Test::ControllerHelpers

spec/helpers/jsxc_helper_spec.rb

-require 'spec_helper'
-
 describe JsxcHelper, :type => :helper do
   before do
     AppConfig.chat.server.bosh.port = 1234

spec/helpers/language_helper_spec.rb

-require "spec_helper"
-
 describe LanguageHelper, type: :helper do
   describe "#get_javascript_strings_for" do
     it "generates a jasmine fixture", fixture: true do

spec/helpers/layout_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe LayoutHelper, :type => :helper do
   describe "#page_title" do
     context "passed blank text" do

spec/helpers/meta_data_helper_spec.rb

-require "spec_helper"
-
 describe MetaDataHelper, type: :helper do
   describe "#meta_tag" do
     it "returns an empty string if passed an empty hash" do

spec/helpers/notifications_helper_spec.rb

-require "spec_helper"
-
 describe NotificationsHelper, type: :helper do
   include ApplicationHelper
 

spec/helpers/notifier_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe NotifierHelper, :type => :helper do
   describe '#post_message' do
     before do

spec/helpers/o_embed_helper_spec.rb

-require 'spec_helper'
-
 describe OEmbedHelper, :type => :helper do
   describe 'o_embed_html' do
     scenarios = {

spec/helpers/open_graph_helper_spec.rb

-require 'spec_helper'
-
 describe OpenGraphHelper, :type => :helper do
 
   describe 'og_html' do

spec/helpers/people_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PeopleHelper, :type => :helper do
   before do
     @user = alice

spec/helpers/posts_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require 'spec_helper'
-
 describe PostsHelper, :type => :helper do
 
   describe '#post_page_title' do

spec/helpers/report_helper_spec.rb

-require "spec_helper"
-
 describe ReportHelper, type: :helper do
   before do
     @user = bob

spec/helpers/stream_helper_spec.rb

@@ -2,8 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
-require "spec_helper"
-
 describe StreamHelper, type: :helper do