diff --git a/.rspec b/.rspec index 174e25596..554b09b48 100644 --- a/.rspec +++ b/.rspec @@ -3,3 +3,4 @@ --color --tag ~performance --order random +--require spec_helper diff --git a/Changelog.md b/Changelog.md index aac76fcf8..3bc8ad976 100644 --- a/Changelog.md +++ b/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) diff --git a/spec/configuration_methods_spec.rb b/spec/configuration_methods_spec.rb index a0d4e5d8f..f3b4595cf 100644 --- a/spec/configuration_methods_spec.rb +++ b/spec/configuration_methods_spec.rb @@ -1,5 +1,3 @@ -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) diff --git a/spec/controllers/admin/pods_controller_spec.rb b/spec/controllers/admin/pods_controller_spec.rb index cd4e198b3..9244351ee 100644 --- a/spec/controllers/admin/pods_controller_spec.rb +++ b/spec/controllers/admin/pods_controller_spec.rb @@ -1,6 +1,3 @@ - -require "spec_helper" - describe Admin::PodsController, type: :controller do before do @user = FactoryGirl.create :user diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index d9f9dd911..e96fa750e 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -1,6 +1,3 @@ - -require 'spec_helper' - describe Admin::UsersController, :type => :controller do before do @user = FactoryGirl.create :user diff --git a/spec/controllers/admins_controller_spec.rb b/spec/controllers/admins_controller_spec.rb index bf4763a47..8d617d7c9 100644 --- a/spec/controllers/admins_controller_spec.rb +++ b/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 diff --git a/spec/controllers/api/openid_connect/authorizations_controller_spec.rb b/spec/controllers/api/openid_connect/authorizations_controller_spec.rb index 9a0631e63..41f49e53d 100644 --- a/spec/controllers/api/openid_connect/authorizations_controller_spec.rb +++ b/spec/controllers/api/openid_connect/authorizations_controller_spec.rb @@ -1,5 +1,3 @@ -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) } diff --git a/spec/controllers/api/openid_connect/clients_controller_spec.rb b/spec/controllers/api/openid_connect/clients_controller_spec.rb index 6ac6bc60d..5477d2fa3 100644 --- a/spec/controllers/api/openid_connect/clients_controller_spec.rb +++ b/spec/controllers/api/openid_connect/clients_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::ClientsController, type: :controller, suppress_csrf_verification: :none do describe "#create" do context "when valid parameters are passed" do diff --git a/spec/controllers/api/openid_connect/discovery_controller_spec.rb b/spec/controllers/api/openid_connect/discovery_controller_spec.rb index 19b90d6c5..9d2ff4526 100644 --- a/spec/controllers/api/openid_connect/discovery_controller_spec.rb +++ b/spec/controllers/api/openid_connect/discovery_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::DiscoveryController, type: :controller do describe "#webfinger" do before do diff --git a/spec/controllers/api/openid_connect/id_tokens_controller_spec.rb b/spec/controllers/api/openid_connect/id_tokens_controller_spec.rb index ec8ab8643..eb7bccefa 100644 --- a/spec/controllers/api/openid_connect/id_tokens_controller_spec.rb +++ b/spec/controllers/api/openid_connect/id_tokens_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::IdTokensController, type: :controller do describe "#jwks" do before do diff --git a/spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb b/spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb index e1aa5a3eb..c3a484085 100644 --- a/spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb +++ b/spec/controllers/api/openid_connect/token_endpoint_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::TokenEndpointController, type: :controller, suppress_csrf_verification: :none do let(:auth) { FactoryGirl.create(:auth_with_read) } diff --git a/spec/controllers/api/openid_connect/user_applications_spec.rb b/spec/controllers/api/openid_connect/user_applications_spec.rb index 588384159..3a94d830e 100644 --- a/spec/controllers/api/openid_connect/user_applications_spec.rb +++ b/spec/controllers/api/openid_connect/user_applications_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::UserApplicationsController, type: :controller do before do @app = FactoryGirl.create(:o_auth_application_with_xss) diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb index d9501a19c..faacf265f 100644 --- a/spec/controllers/application_controller_spec.rb +++ b/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 diff --git a/spec/controllers/aspect_memberships_controller_spec.rb b/spec/controllers/aspect_memberships_controller_spec.rb index a0a418061..90e706e29 100644 --- a/spec/controllers/aspect_memberships_controller_spec.rb +++ b/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 diff --git a/spec/controllers/aspects_controller_spec.rb b/spec/controllers/aspects_controller_spec.rb index c8f971ae1..4278b078d 100644 --- a/spec/controllers/aspects_controller_spec.rb +++ b/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 diff --git a/spec/controllers/blocks_controller_spec.rb b/spec/controllers/blocks_controller_spec.rb index 1937c1e2d..de16662ea 100644 --- a/spec/controllers/blocks_controller_spec.rb +++ b/spec/controllers/blocks_controller_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe BlocksController, :type => :controller do before do sign_in alice diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 704df125e..a155cf531 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/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) diff --git a/spec/controllers/contacts_controller_spec.rb b/spec/controllers/contacts_controller_spec.rb index 8b7723b25..e12a97c3f 100644 --- a/spec/controllers/contacts_controller_spec.rb +++ b/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 diff --git a/spec/controllers/conversation_visibilities_controller_spec.rb b/spec/controllers/conversation_visibilities_controller_spec.rb index f9dc655bd..5b8893c1e 100644 --- a/spec/controllers/conversation_visibilities_controller_spec.rb +++ b/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 diff --git a/spec/controllers/conversations_controller_spec.rb b/spec/controllers/conversations_controller_spec.rb index 91226b902..9bf0c6cc1 100644 --- a/spec/controllers/conversations_controller_spec.rb +++ b/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 diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb index 4d012e4eb..b40bcbbaa 100644 --- a/spec/controllers/help_controller_spec.rb +++ b/spec/controllers/help_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe HelpController, type: :controller do describe "#faq" do it "succeeds" do diff --git a/spec/controllers/home_controller_spec.rb b/spec/controllers/home_controller_spec.rb index 95cc5c40d..80b9bc023 100644 --- a/spec/controllers/home_controller_spec.rb +++ b/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 diff --git a/spec/controllers/invitation_codes_controller_spec.rb b/spec/controllers/invitation_codes_controller_spec.rb index 36d72f13b..90864fefc 100644 --- a/spec/controllers/invitation_codes_controller_spec.rb +++ b/spec/controllers/invitation_codes_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe InvitationCodesController, type: :controller do describe "#show" do it "redirects to the root page if the invitation code is invalid" do diff --git a/spec/controllers/invitations_controller_spec.rb b/spec/controllers/invitations_controller_spec.rb index 00e6b2e8c..7fb2b03fb 100644 --- a/spec/controllers/invitations_controller_spec.rb +++ b/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" } diff --git a/spec/controllers/jasmine_fixtures/admins_spec.rb b/spec/controllers/jasmine_fixtures/admins_spec.rb index af4784d22..23a448ed8 100644 --- a/spec/controllers/jasmine_fixtures/admins_spec.rb +++ b/spec/controllers/jasmine_fixtures/admins_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe AdminsController, type: :controller do describe "#dashboard" do before do diff --git a/spec/controllers/jasmine_fixtures/aspects_spec.rb b/spec/controllers/jasmine_fixtures/aspects_spec.rb index f3ea2b5ba..e2adf493d 100644 --- a/spec/controllers/jasmine_fixtures/aspects_spec.rb +++ b/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 diff --git a/spec/controllers/jasmine_fixtures/contacts_spec.rb b/spec/controllers/jasmine_fixtures/contacts_spec.rb index 3e6cb3c85..127f9be2a 100644 --- a/spec/controllers/jasmine_fixtures/contacts_spec.rb +++ b/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 diff --git a/spec/controllers/jasmine_fixtures/conversations_spec.rb b/spec/controllers/jasmine_fixtures/conversations_spec.rb index c07360d69..cfba3708b 100644 --- a/spec/controllers/jasmine_fixtures/conversations_spec.rb +++ b/spec/controllers/jasmine_fixtures/conversations_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe ConversationsController, :type => :controller do describe '#index' do before do diff --git a/spec/controllers/jasmine_fixtures/notifications_spec.rb b/spec/controllers/jasmine_fixtures/notifications_spec.rb index 0b1400add..687bc2523 100644 --- a/spec/controllers/jasmine_fixtures/notifications_spec.rb +++ b/spec/controllers/jasmine_fixtures/notifications_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe NotificationsController, :type => :controller do describe '#index' do before do diff --git a/spec/controllers/jasmine_fixtures/people_spec.rb b/spec/controllers/jasmine_fixtures/people_spec.rb index eb387f06e..432ff5d5c 100644 --- a/spec/controllers/jasmine_fixtures/people_spec.rb +++ b/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 diff --git a/spec/controllers/jasmine_fixtures/photos_spec.rb b/spec/controllers/jasmine_fixtures/photos_spec.rb index cde36c7b2..fd62b21a6 100644 --- a/spec/controllers/jasmine_fixtures/photos_spec.rb +++ b/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) diff --git a/spec/controllers/jasmine_fixtures/status_messages_spec.rb b/spec/controllers/jasmine_fixtures/status_messages_spec.rb index 0787327ff..905a5137c 100644 --- a/spec/controllers/jasmine_fixtures/status_messages_spec.rb +++ b/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 diff --git a/spec/controllers/jasmine_fixtures/streams_spec.rb b/spec/controllers/jasmine_fixtures/streams_spec.rb index 485343c18..5447a5420 100644 --- a/spec/controllers/jasmine_fixtures/streams_spec.rb +++ b/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 diff --git a/spec/controllers/jasmine_fixtures/users_spec.rb b/spec/controllers/jasmine_fixtures/users_spec.rb index 9eb2e17b9..54d624a77 100644 --- a/spec/controllers/jasmine_fixtures/users_spec.rb +++ b/spec/controllers/jasmine_fixtures/users_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe UsersController, type: :controller do before do sign_in alice, scope: :user diff --git a/spec/controllers/likes_controller_spec.rb b/spec/controllers/likes_controller_spec.rb index 606cf69db..2aa04680e 100644 --- a/spec/controllers/likes_controller_spec.rb +++ b/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 diff --git a/spec/controllers/messages_controller_spec.rb b/spec/controllers/messages_controller_spec.rb index 27e8bfe4f..7e753c4f0 100644 --- a/spec/controllers/messages_controller_spec.rb +++ b/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) diff --git a/spec/controllers/node_info_controller_spec.rb b/spec/controllers/node_info_controller_spec.rb index 106a5a1c8..be7ca72a5 100644 --- a/spec/controllers/node_info_controller_spec.rb +++ b/spec/controllers/node_info_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe NodeInfoController do describe "#jrd" do it "responds to JSON" do diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb index 4c4a16077..e64b45bb4 100644 --- a/spec/controllers/notifications_controller_spec.rb +++ b/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 diff --git a/spec/controllers/participations_controller_spec.rb b/spec/controllers/participations_controller_spec.rb index 576c66a7c..f557188f1 100644 --- a/spec/controllers/participations_controller_spec.rb +++ b/spec/controllers/participations_controller_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe ParticipationsController, :type => :controller do before do allow(@controller).to receive(:current_user).and_return(alice) diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb index 45a55e28b..31c3d3e73 100644 --- a/spec/controllers/passwords_controller_spec.rb +++ b/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] diff --git a/spec/controllers/people_controller_spec.rb b/spec/controllers/people_controller_spec.rb index c35a6ce23..846244927 100644 --- a/spec/controllers/people_controller_spec.rb +++ b/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 diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb index 5cad2566b..9b76fffe5 100644 --- a/spec/controllers/photos_controller_spec.rb +++ b/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) diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb index 82464ad3a..7f2d9c9fb 100644 --- a/spec/controllers/posts_controller_spec.rb +++ b/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) } diff --git a/spec/controllers/profiles_controller_spec.rb b/spec/controllers/profiles_controller_spec.rb index 88b082d23..9a6a47e8e 100644 --- a/spec/controllers/profiles_controller_spec.rb +++ b/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 diff --git a/spec/controllers/registrations_controller_spec.rb b/spec/controllers/registrations_controller_spec.rb index 49e07fa19..d39edb683 100644 --- a/spec/controllers/registrations_controller_spec.rb +++ b/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] diff --git a/spec/controllers/report_controller_spec.rb b/spec/controllers/report_controller_spec.rb index fc64d36dd..bb049243c 100644 --- a/spec/controllers/report_controller_spec.rb +++ b/spec/controllers/report_controller_spec.rb @@ -1,10 +1,7 @@ - # 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 diff --git a/spec/controllers/reshares_controller_spec.rb b/spec/controllers/reshares_controller_spec.rb index c6f50f2d5..2dc48daca 100644 --- a/spec/controllers/reshares_controller_spec.rb +++ b/spec/controllers/reshares_controller_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe ResharesController, :type => :controller do describe '#create' do let(:post_request!) { diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb index 58a62ba71..89347f454 100644 --- a/spec/controllers/search_controller_spec.rb +++ b/spec/controllers/search_controller_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe SearchController, :type => :controller do before do @user = alice diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb index 5c0c2f51f..75cff3391 100644 --- a/spec/controllers/services_controller_spec.rb +++ b/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', diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 51e736183..55ae17bae 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/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 } diff --git a/spec/controllers/share_visibilities_controller_spec.rb b/spec/controllers/share_visibilities_controller_spec.rb index 9b61cc80c..30c0151e9 100644 --- a/spec/controllers/share_visibilities_controller_spec.rb +++ b/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) diff --git a/spec/controllers/social_relay_controller_spec.rb b/spec/controllers/social_relay_controller_spec.rb index 9b2f10be7..1949eb0c7 100644 --- a/spec/controllers/social_relay_controller_spec.rb +++ b/spec/controllers/social_relay_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe SocialRelayController, type: :controller do describe "#well_known" do it "responds to format json" do diff --git a/spec/controllers/status_messages_controller_spec.rb b/spec/controllers/status_messages_controller_spec.rb index 0c5ad604e..62fba474c 100644 --- a/spec/controllers/status_messages_controller_spec.rb +++ b/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 diff --git a/spec/controllers/streams_controller_spec.rb b/spec/controllers/streams_controller_spec.rb index 9aeb5f319..e7114cb1f 100644 --- a/spec/controllers/streams_controller_spec.rb +++ b/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 diff --git a/spec/controllers/tag_followings_controller_spec.rb b/spec/controllers/tag_followings_controller_spec.rb index 46546dd22..6ee1b138b 100644 --- a/spec/controllers/tag_followings_controller_spec.rb +++ b/spec/controllers/tag_followings_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe TagFollowingsController, type: :controller do describe "#manage" do context "not signed in" do diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index 3d60feb2e..3b49bccbc 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/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 diff --git a/spec/controllers/terms_controller_spec.rb b/spec/controllers/terms_controller_spec.rb index 78eb0f048..ea948a153 100644 --- a/spec/controllers/terms_controller_spec.rb +++ b/spec/controllers/terms_controller_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe TermsController, type: :controller do describe "#index" do it "succeeds" do diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 0d4a31b16..a80f9f37e 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/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 diff --git a/spec/federation_callbacks_spec.rb b/spec/federation_callbacks_spec.rb index 73193f824..253484ded 100644 --- a/spec/federation_callbacks_spec.rb +++ b/spec/federation_callbacks_spec.rb @@ -1,4 +1,3 @@ -require "spec_helper" require "diaspora_federation/test" describe "diaspora federation callbacks" do diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index e03b15624..84bc7cc35 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/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 diff --git a/spec/helpers/conversations_helper_spec.rb b/spec/helpers/conversations_helper_spec.rb index fafde29bf..24768fe7a 100644 --- a/spec/helpers/conversations_helper_spec.rb +++ b/spec/helpers/conversations_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe ConversationsHelper, :type => :helper do before do @conversation = FactoryGirl.create(:conversation) diff --git a/spec/helpers/getting_started_helper_spec.rb b/spec/helpers/getting_started_helper_spec.rb index fea1fcf89..7b89fbe24 100644 --- a/spec/helpers/getting_started_helper_spec.rb +++ b/spec/helpers/getting_started_helper_spec.rb @@ -1,7 +1,6 @@ # 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 diff --git a/spec/helpers/gon_helper_spec.rb b/spec/helpers/gon_helper_spec.rb index c449c9126..e09712242 100644 --- a/spec/helpers/gon_helper_spec.rb +++ b/spec/helpers/gon_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe GonHelper, type: :helper do include_context :gon diff --git a/spec/helpers/interim_stream_hackiness_helper_spec.rb b/spec/helpers/interim_stream_hackiness_helper_spec.rb index 31fcfc2e9..fe6b787b2 100644 --- a/spec/helpers/interim_stream_hackiness_helper_spec.rb +++ b/spec/helpers/interim_stream_hackiness_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe InterimStreamHackinessHelper, type: :helper do describe "commenting_disabled?" do include Devise::Test::ControllerHelpers diff --git a/spec/helpers/jsxc_helper_spec.rb b/spec/helpers/jsxc_helper_spec.rb index abbf5e0b3..18bdb4daa 100644 --- a/spec/helpers/jsxc_helper_spec.rb +++ b/spec/helpers/jsxc_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe JsxcHelper, :type => :helper do before do AppConfig.chat.server.bosh.port = 1234 diff --git a/spec/helpers/language_helper_spec.rb b/spec/helpers/language_helper_spec.rb index 73d4df5f8..3b0e9431a 100644 --- a/spec/helpers/language_helper_spec.rb +++ b/spec/helpers/language_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe LanguageHelper, type: :helper do describe "#get_javascript_strings_for" do it "generates a jasmine fixture", fixture: true do diff --git a/spec/helpers/layout_helper_spec.rb b/spec/helpers/layout_helper_spec.rb index 8810e9ee3..153797769 100644 --- a/spec/helpers/layout_helper_spec.rb +++ b/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 diff --git a/spec/helpers/meta_data_helper_spec.rb b/spec/helpers/meta_data_helper_spec.rb index 7564dd04a..998d35721 100644 --- a/spec/helpers/meta_data_helper_spec.rb +++ b/spec/helpers/meta_data_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe MetaDataHelper, type: :helper do describe "#meta_tag" do it "returns an empty string if passed an empty hash" do diff --git a/spec/helpers/notifications_helper_spec.rb b/spec/helpers/notifications_helper_spec.rb index daf579b3c..7f5f2e601 100644 --- a/spec/helpers/notifications_helper_spec.rb +++ b/spec/helpers/notifications_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe NotificationsHelper, type: :helper do include ApplicationHelper diff --git a/spec/helpers/notifier_helper_spec.rb b/spec/helpers/notifier_helper_spec.rb index 0ff872da2..ca8a31934 100644 --- a/spec/helpers/notifier_helper_spec.rb +++ b/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 diff --git a/spec/helpers/o_embed_helper_spec.rb b/spec/helpers/o_embed_helper_spec.rb index 306860ebf..c36759026 100644 --- a/spec/helpers/o_embed_helper_spec.rb +++ b/spec/helpers/o_embed_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe OEmbedHelper, :type => :helper do describe 'o_embed_html' do scenarios = { diff --git a/spec/helpers/open_graph_helper_spec.rb b/spec/helpers/open_graph_helper_spec.rb index f72796151..7962781e7 100644 --- a/spec/helpers/open_graph_helper_spec.rb +++ b/spec/helpers/open_graph_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe OpenGraphHelper, :type => :helper do describe 'og_html' do diff --git a/spec/helpers/people_helper_spec.rb b/spec/helpers/people_helper_spec.rb index d650a8714..866b56fd0 100644 --- a/spec/helpers/people_helper_spec.rb +++ b/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 diff --git a/spec/helpers/posts_helper_spec.rb b/spec/helpers/posts_helper_spec.rb index a6ca72c07..d10e529e4 100644 --- a/spec/helpers/posts_helper_spec.rb +++ b/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 diff --git a/spec/helpers/report_helper_spec.rb b/spec/helpers/report_helper_spec.rb index 0eb854639..f044c0364 100644 --- a/spec/helpers/report_helper_spec.rb +++ b/spec/helpers/report_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ReportHelper, type: :helper do before do @user = bob diff --git a/spec/helpers/stream_helper_spec.rb b/spec/helpers/stream_helper_spec.rb index 2afd7ff4f..05d975321 100644 --- a/spec/helpers/stream_helper_spec.rb +++ b/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 describe "next_page_path" do def build_controller controller_class diff --git a/spec/helpers/tags_helper_spec.rb b/spec/helpers/tags_helper_spec.rb index 748d591d8..7667ea1bf 100644 --- a/spec/helpers/tags_helper_spec.rb +++ b/spec/helpers/tags_helper_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe TagsHelper, :type => :helper do describe '#looking_for_tag_link' do it 'returns nil if there is a @ in the query' do diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb index c67789bf6..aa5a83a5f 100644 --- a/spec/helpers/users_helper_spec.rb +++ b/spec/helpers/users_helper_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe UsersHelper, type: :helper do include Devise::Test::ControllerHelpers diff --git a/spec/integration/account_deletion_spec.rb b/spec/integration/account_deletion_spec.rb index abe3c4db2..dfe3ee7c0 100644 --- a/spec/integration/account_deletion_spec.rb +++ b/spec/integration/account_deletion_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe "deleteing your account", type: :request do context "user" do before do diff --git a/spec/integration/api/user_info_controller_spec.rb b/spec/integration/api/user_info_controller_spec.rb index 1f237a172..eaff50459 100644 --- a/spec/integration/api/user_info_controller_spec.rb +++ b/spec/integration/api/user_info_controller_spec.rb @@ -1,4 +1,3 @@ -require "spec_helper" describe Api::OpenidConnect::UserInfoController do let!(:auth_with_read_and_ppid) { FactoryGirl.create(:auth_with_read_and_ppid) } let!(:access_token_with_read) { auth_with_read_and_ppid.create_access_token.to_s } diff --git a/spec/integration/application_spec.rb b/spec/integration/application_spec.rb index 7f5527896..39c6c0d67 100644 --- a/spec/integration/application_spec.rb +++ b/spec/integration/application_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ApplicationController, type: :request do describe "csrf token validation" do context "without a current user" do diff --git a/spec/integration/contact_deleting_spec.rb b/spec/integration/contact_deleting_spec.rb index 255680d08..a08ead841 100644 --- a/spec/integration/contact_deleting_spec.rb +++ b/spec/integration/contact_deleting_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 'disconnecting a contact', :type => :request do it 'removes the aspect membership' do @user = alice diff --git a/spec/integration/contacts_spec.rb b/spec/integration/contacts_spec.rb index ca1ddef00..1af6ae508 100644 --- a/spec/integration/contacts_spec.rb +++ b/spec/integration/contacts_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ContactsController, type: :request do describe "/contacts" do context "user is signed in" do diff --git a/spec/integration/dispatching_spec.rb b/spec/integration/dispatching_spec.rb index 2a18e8e09..58124de3a 100644 --- a/spec/integration/dispatching_spec.rb +++ b/spec/integration/dispatching_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe "Dispatching", type: :request do context "a comment retraction on a public post" do it "triggers a public dispatch" do diff --git a/spec/integration/federation/attack_vectors_spec.rb b/spec/integration/federation/attack_vectors_spec.rb index 541de7de5..e345420ef 100644 --- a/spec/integration/federation/attack_vectors_spec.rb +++ b/spec/integration/federation/attack_vectors_spec.rb @@ -2,7 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require "spec_helper" require "integration/federation/federation_helper" describe "attack vectors", type: :request do diff --git a/spec/integration/federation/receive_federation_messages_spec.rb b/spec/integration/federation/receive_federation_messages_spec.rb index b0139b8d8..85a2b142d 100644 --- a/spec/integration/federation/receive_federation_messages_spec.rb +++ b/spec/integration/federation/receive_federation_messages_spec.rb @@ -1,4 +1,3 @@ -require "spec_helper" require "integration/federation/federation_helper" require "integration/federation/shared_receive_relayable" require "integration/federation/shared_receive_retraction" diff --git a/spec/integration/mentioning_spec.rb b/spec/integration/mentioning_spec.rb index 78ee92404..8b8af8d0b 100644 --- a/spec/integration/mentioning_spec.rb +++ b/spec/integration/mentioning_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - module MentioningSpecHelpers def default_aspect @user1.aspects.where(name: "generic").first diff --git a/spec/integration/mobile_posts_spec.rb b/spec/integration/mobile_posts_spec.rb index 54cc2e60c..1ffd10a79 100644 --- a/spec/integration/mobile_posts_spec.rb +++ b/spec/integration/mobile_posts_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PostsController, type: :request do context "with a poll" do let(:sm) { FactoryGirl.build(:status_message_with_poll, public: true) } diff --git a/spec/integration/profile_spec.rb b/spec/integration/profile_spec.rb index 1e61cdb12..36be045d6 100644 --- a/spec/integration/profile_spec.rb +++ b/spec/integration/profile_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PeopleController, type: :request do context "for the current user" do before do diff --git a/spec/integration/receiving_spec.rb b/spec/integration/receiving_spec.rb index c07a6d509..faa8ffb20 100644 --- a/spec/integration/receiving_spec.rb +++ b/spec/integration/receiving_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 'a user receives a post', :type => :request do before do @alices_aspect = alice.aspects.where(:name => "generic").first diff --git a/spec/integration/tag_people_spec.rb b/spec/integration/tag_people_spec.rb index 9dc6db029..336b7acf0 100644 --- a/spec/integration/tag_people_spec.rb +++ b/spec/integration/tag_people_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe TagsController, :type => :request do describe 'will_paginate people on the tag page' do let(:people) { (1..2).map { FactoryGirl.create(:person) } } diff --git a/spec/lib/account_deleter_spec.rb b/spec/lib/account_deleter_spec.rb index 8ca011b2b..e67920157 100644 --- a/spec/lib/account_deleter_spec.rb +++ b/spec/lib/account_deleter_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 AccountDeleter do before do @account_deletion = AccountDeleter.new(bob.person.diaspora_handle) diff --git a/spec/lib/api/openid_connect/protected_resource_endpoint_spec.rb b/spec/lib/api/openid_connect/protected_resource_endpoint_spec.rb index 4c9035ece..e93a995ef 100644 --- a/spec/lib/api/openid_connect/protected_resource_endpoint_spec.rb +++ b/spec/lib/api/openid_connect/protected_resource_endpoint_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::ProtectedResourceEndpoint, type: :request do let(:auth_with_read) { FactoryGirl.create(:auth_with_read) } let!(:access_token_with_read) { auth_with_read.create_access_token.to_s } diff --git a/spec/lib/api/openid_connect/token_endpoint_spec.rb b/spec/lib/api/openid_connect/token_endpoint_spec.rb index 37eba5380..a455f8ffa 100644 --- a/spec/lib/api/openid_connect/token_endpoint_spec.rb +++ b/spec/lib/api/openid_connect/token_endpoint_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::TokenEndpoint, type: :request do let!(:client) { FactoryGirl.create(:o_auth_application_with_ppid) } let!(:auth) { diff --git a/spec/lib/configuration_methods_spec.rb b/spec/lib/configuration_methods_spec.rb index 8e474c381..76fb4a9ab 100644 --- a/spec/lib/configuration_methods_spec.rb +++ b/spec/lib/configuration_methods_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Configuration::Methods do before(:all) do @settings = Configurate::Settings.create do diff --git a/spec/lib/connection_tester_spec.rb b/spec/lib/connection_tester_spec.rb index 22fc906bd..85dd5d0a2 100644 --- a/spec/lib/connection_tester_spec.rb +++ b/spec/lib/connection_tester_spec.rb @@ -1,6 +1,3 @@ - -require "spec_helper" - describe ConnectionTester do let(:url) { "https://pod.example.com" } let(:result) { ConnectionTester::Result.new } diff --git a/spec/lib/diaspora/camo_spec.rb b/spec/lib/diaspora/camo_spec.rb index 3e970340e..6c72fce08 100644 --- a/spec/lib/diaspora/camo_spec.rb +++ b/spec/lib/diaspora/camo_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 Diaspora::Camo do before do AppConfig.privacy.camo.root = 'http://localhost:3000/camo/' diff --git a/spec/lib/diaspora/exporter_spec.rb b/spec/lib/diaspora/exporter_spec.rb index 7bb429cc8..d12cfd2d0 100644 --- a/spec/lib/diaspora/exporter_spec.rb +++ b/spec/lib/diaspora/exporter_spec.rb @@ -2,7 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' require Rails.root.join('lib', 'diaspora', 'exporter') describe Diaspora::Exporter do diff --git a/spec/lib/diaspora/federated/base_spec.rb b/spec/lib/diaspora/federated/base_spec.rb index 78b262dfd..706abb7b3 100644 --- a/spec/lib/diaspora/federated/base_spec.rb +++ b/spec/lib/diaspora/federated/base_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 Diaspora::Federated::Base do class Foo include Diaspora::Federated::Base diff --git a/spec/lib/diaspora/federated/retraction_spec.rb b/spec/lib/diaspora/federated/retraction_spec.rb index 450ff20c9..3f7b9f39b 100644 --- a/spec/lib/diaspora/federated/retraction_spec.rb +++ b/spec/lib/diaspora/federated/retraction_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 Retraction do let(:post) { alice.post(:status_message, text: "destroy!", public: true) } let(:retraction) { Retraction.for(post, alice) } diff --git a/spec/lib/diaspora/federation/dispatcher/private_spec.rb b/spec/lib/diaspora/federation/dispatcher/private_spec.rb index b70d7996d..9f20ece51 100644 --- a/spec/lib/diaspora/federation/dispatcher/private_spec.rb +++ b/spec/lib/diaspora/federation/dispatcher/private_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Federation::Dispatcher::Private do let(:post) { FactoryGirl.create(:status_message, author: alice.person, text: "hello", public: false) } let(:comment) { FactoryGirl.create(:comment, author: alice.person, post: post) } diff --git a/spec/lib/diaspora/federation/dispatcher/public_spec.rb b/spec/lib/diaspora/federation/dispatcher/public_spec.rb index 20c144ea6..bb5bac652 100644 --- a/spec/lib/diaspora/federation/dispatcher/public_spec.rb +++ b/spec/lib/diaspora/federation/dispatcher/public_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Federation::Dispatcher::Public do let(:post) { FactoryGirl.create(:status_message, author: alice.person, text: "hello", public: true) } let(:comment) { FactoryGirl.create(:comment, author: alice.person, post: post) } diff --git a/spec/lib/diaspora/federation/dispatcher_spec.rb b/spec/lib/diaspora/federation/dispatcher_spec.rb index 40ab01dc8..d4baadade 100644 --- a/spec/lib/diaspora/federation/dispatcher_spec.rb +++ b/spec/lib/diaspora/federation/dispatcher_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Federation::Dispatcher do let(:post) { FactoryGirl.create(:status_message, author: alice.person, text: "hello", public: true) } let(:opts) { {service_types: "Services::Twitter"} } diff --git a/spec/lib/diaspora/federation/entities_spec.rb b/spec/lib/diaspora/federation/entities_spec.rb index 8e97e6705..671cbd562 100644 --- a/spec/lib/diaspora/federation/entities_spec.rb +++ b/spec/lib/diaspora/federation/entities_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Federation::Entities do describe ".build" do it "builds an account deletion" do diff --git a/spec/lib/diaspora/federation/receive_spec.rb b/spec/lib/diaspora/federation/receive_spec.rb index df9e5da67..7e55bb7b8 100644 --- a/spec/lib/diaspora/federation/receive_spec.rb +++ b/spec/lib/diaspora/federation/receive_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Federation::Receive do let(:sender) { FactoryGirl.create(:person) } let(:post) { FactoryGirl.create(:status_message, text: "hello", public: true, author: alice.person) } diff --git a/spec/lib/diaspora/fetcher/public_spec.rb b/spec/lib/diaspora/fetcher/public_spec.rb index 6ad2fbebe..08468d105 100644 --- a/spec/lib/diaspora/fetcher/public_spec.rb +++ b/spec/lib/diaspora/fetcher/public_spec.rb @@ -2,12 +2,9 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - # Tests fetching public posts of a person on a remote server describe Diaspora::Fetcher::Public do before do - # the fixture is taken from an actual json request. # it contains 10 StatusMessages and 5 Reshares, all of them public # the guid of the person is "7445f9a0a6c28ebb" diff --git a/spec/lib/diaspora/markdownify_email_spec.rb b/spec/lib/diaspora/markdownify_email_spec.rb index 5d4ae7186..bac2de175 100644 --- a/spec/lib/diaspora/markdownify_email_spec.rb +++ b/spec/lib/diaspora/markdownify_email_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Diaspora::Markdownify::Email do include Rails.application.routes.url_helpers diff --git a/spec/lib/diaspora/markdownify_spec.rb b/spec/lib/diaspora/markdownify_spec.rb index 161f88ff6..10ac97a8b 100644 --- a/spec/lib/diaspora/markdownify_spec.rb +++ b/spec/lib/diaspora/markdownify_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Markdownify::HTML do describe "#autolink" do before do diff --git a/spec/lib/diaspora/mentionable_spec.rb b/spec/lib/diaspora/mentionable_spec.rb index 552097a2e..365d2dd04 100644 --- a/spec/lib/diaspora/mentionable_spec.rb +++ b/spec/lib/diaspora/mentionable_spec.rb @@ -1,6 +1,3 @@ - -require "spec_helper" - describe Diaspora::Mentionable do include PeopleHelper diff --git a/spec/lib/diaspora/message_renderer_spec.rb b/spec/lib/diaspora/message_renderer_spec.rb index 9362c6fd0..fa0aa3b3b 100644 --- a/spec/lib/diaspora/message_renderer_spec.rb +++ b/spec/lib/diaspora/message_renderer_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Diaspora::MessageRenderer do MESSAGE_NORMALIZTIONS = { "\u202a#\u200eUSA\u202c" => "#USA", diff --git a/spec/lib/diaspora/shareable_spec.rb b/spec/lib/diaspora/shareable_spec.rb index 4df87e80a..716373a4d 100644 --- a/spec/lib/diaspora/shareable_spec.rb +++ b/spec/lib/diaspora/shareable_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Shareable do describe "scopes" do context "having multiple objects with equal db IDs" do diff --git a/spec/lib/diaspora/taggable_spec.rb b/spec/lib/diaspora/taggable_spec.rb index bbc557d6e..501285623 100644 --- a/spec/lib/diaspora/taggable_spec.rb +++ b/spec/lib/diaspora/taggable_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Diaspora::Taggable do include Rails.application.routes.url_helpers diff --git a/spec/lib/direction_detector_spec.rb b/spec/lib/direction_detector_spec.rb index 9b28700e3..50c924b8a 100644 --- a/spec/lib/direction_detector_spec.rb +++ b/spec/lib/direction_detector_spec.rb @@ -3,8 +3,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - describe String do let(:english) { "Hello World" } let(:chinese) { "你好世界" } diff --git a/spec/lib/email_inviter_spec.rb b/spec/lib/email_inviter_spec.rb index 68cd1197c..33f7fecfd 100644 --- a/spec/lib/email_inviter_spec.rb +++ b/spec/lib/email_inviter_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe EmailInviter do before do @user = double(:invitation_code => 'coolcodebro', :present? => true, diff --git a/spec/lib/evil_query_spec.rb b/spec/lib/evil_query_spec.rb index fed0c55ed..082cccead 100644 --- a/spec/lib/evil_query_spec.rb +++ b/spec/lib/evil_query_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe EvilQuery::MultiStream do let(:evil_query) { EvilQuery::MultiStream.new(alice, "created_at", Time.zone.now, true) } diff --git a/spec/lib/i18n_interpolation_fallbacks_spec.rb b/spec/lib/i18n_interpolation_fallbacks_spec.rb index a93fe1f59..5c306849d 100644 --- a/spec/lib/i18n_interpolation_fallbacks_spec.rb +++ b/spec/lib/i18n_interpolation_fallbacks_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 "i18n interpolation fallbacks" do describe "when string does not require interpolation arguments" do it "works normally" do diff --git a/spec/lib/publisher_spec.rb b/spec/lib/publisher_spec.rb index abbd5ab5b..8eeb76d24 100644 --- a/spec/lib/publisher_spec.rb +++ b/spec/lib/publisher_spec.rb @@ -1,6 +1,3 @@ - -require 'spec_helper' - describe Publisher do before do @publisher = Publisher.new(alice) diff --git a/spec/lib/pubsubhubbub_spec.rb b/spec/lib/pubsubhubbub_spec.rb index 896e08279..0292c6472 100644 --- a/spec/lib/pubsubhubbub_spec.rb +++ b/spec/lib/pubsubhubbub_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 Pubsubhubbub do describe '#publish' do it 'posts the feed to the given hub' do diff --git a/spec/lib/rack/internet_explorer_version_spec.rb b/spec/lib/rack/internet_explorer_version_spec.rb index 2bc7a75c0..78781cb25 100644 --- a/spec/lib/rack/internet_explorer_version_spec.rb +++ b/spec/lib/rack/internet_explorer_version_spec.rb @@ -1,7 +1,6 @@ # 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 Rack::InternetExplorerVersion do before :all do diff --git a/spec/lib/stream/activity_spec.rb b/spec/lib/stream/activity_spec.rb index bb066a3f8..a57cce580 100644 --- a/spec/lib/stream/activity_spec.rb +++ b/spec/lib/stream/activity_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Activity do diff --git a/spec/lib/stream/aspect_spec.rb b/spec/lib/stream/aspect_spec.rb index 96c8ce7c4..6b5003f3a 100644 --- a/spec/lib/stream/aspect_spec.rb +++ b/spec/lib/stream/aspect_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 Stream::Aspect do describe '#aspects' do it 'queries the user given initialized aspect ids' do diff --git a/spec/lib/stream/base_spec.rb b/spec/lib/stream/base_spec.rb index 0ae2c734b..76ddcd1ba 100644 --- a/spec/lib/stream/base_spec.rb +++ b/spec/lib/stream/base_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Base do diff --git a/spec/lib/stream/comments_spec.rb b/spec/lib/stream/comments_spec.rb index 2140eff96..8cc926870 100644 --- a/spec/lib/stream/comments_spec.rb +++ b/spec/lib/stream/comments_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Comments do diff --git a/spec/lib/stream/followed_tag_spec.rb b/spec/lib/stream/followed_tag_spec.rb index f46d49a70..61569d7c4 100644 --- a/spec/lib/stream/followed_tag_spec.rb +++ b/spec/lib/stream/followed_tag_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::FollowedTag do diff --git a/spec/lib/stream/likes_spec.rb b/spec/lib/stream/likes_spec.rb index e4fc44d98..f8d1b2503 100644 --- a/spec/lib/stream/likes_spec.rb +++ b/spec/lib/stream/likes_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Likes do diff --git a/spec/lib/stream/mention_spec.rb b/spec/lib/stream/mention_spec.rb index 399a7945b..bf292dccd 100644 --- a/spec/lib/stream/mention_spec.rb +++ b/spec/lib/stream/mention_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Mention do diff --git a/spec/lib/stream/multi_spec.rb b/spec/lib/stream/multi_spec.rb index b53ee384c..c5c222546 100644 --- a/spec/lib/stream/multi_spec.rb +++ b/spec/lib/stream/multi_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Multi do diff --git a/spec/lib/stream/person_spec.rb b/spec/lib/stream/person_spec.rb index a320f800e..b5cd7422b 100644 --- a/spec/lib/stream/person_spec.rb +++ b/spec/lib/stream/person_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Person do diff --git a/spec/lib/stream/public_spec.rb b/spec/lib/stream/public_spec.rb index a17348cef..f6fbe8b5c 100644 --- a/spec/lib/stream/public_spec.rb +++ b/spec/lib/stream/public_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Public do diff --git a/spec/lib/stream/tag_spec.rb b/spec/lib/stream/tag_spec.rb index 75952680a..afde047f9 100644 --- a/spec/lib/stream/tag_spec.rb +++ b/spec/lib/stream/tag_spec.rb @@ -2,7 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' require Rails.root.join('spec', 'shared_behaviors', 'stream') describe Stream::Tag do diff --git a/spec/locale_spec.rb b/spec/locale_spec.rb index 18ee1864c..9aae0dc13 100644 --- a/spec/locale_spec.rb +++ b/spec/locale_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe 'locale files' do describe "cldr/plurals.rb" do AVAILABLE_LANGUAGE_CODES.each do |locale| diff --git a/spec/mailers/export_spec.rb b/spec/mailers/export_spec.rb index 24b10753b..0c1e7a9ca 100644 --- a/spec/mailers/export_spec.rb +++ b/spec/mailers/export_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 ExportMailer, :type => :mailer do describe '#export_complete_for' do it "should deliver successfully" do diff --git a/spec/mailers/maintenance_spec.rb b/spec/mailers/maintenance_spec.rb index a0df04683..4b997833b 100644 --- a/spec/mailers/maintenance_spec.rb +++ b/spec/mailers/maintenance_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 Maintenance, :type => :mailer do describe 'create warning' do before do diff --git a/spec/mailers/notifier_spec.rb b/spec/mailers/notifier_spec.rb index 6551b9f9c..7593bba03 100644 --- a/spec/mailers/notifier_spec.rb +++ b/spec/mailers/notifier_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Notifier, type: :mailer do let(:person) { FactoryGirl.create(:person) } diff --git a/spec/mailers/report_spec.rb b/spec/mailers/report_spec.rb index 5ecb66923..ce168bb3b 100644 --- a/spec/mailers/report_spec.rb +++ b/spec/mailers/report_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 Report, type: :mailer do describe "#make_notification" do before do diff --git a/spec/misc_spec.rb b/spec/misc_spec.rb index 721b4ddce..1e9851fa9 100644 --- a/spec/misc_spec.rb +++ b/spec/misc_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 'making sure the spec runner works' do it 'factory creates a user with a person saved' do user = FactoryGirl.create(:user) diff --git a/spec/models/account_deletion_spec.rb b/spec/models/account_deletion_spec.rb index 4b0734b19..972435818 100644 --- a/spec/models/account_deletion_spec.rb +++ b/spec/models/account_deletion_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 AccountDeletion, type: :model do let(:account_deletion) { AccountDeletion.new(person: alice.person) } diff --git a/spec/models/acts_as_taggable_on_tag_spec.rb b/spec/models/acts_as_taggable_on_tag_spec.rb index 53e9718d2..c5d341224 100644 --- a/spec/models/acts_as_taggable_on_tag_spec.rb +++ b/spec/models/acts_as_taggable_on_tag_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ActsAsTaggableOn::Tag, :type => :model do subject(:tag) { ActsAsTaggableOn::Tag } diff --git a/spec/models/api/openid_connect/id_token_spec.rb b/spec/models/api/openid_connect/id_token_spec.rb index 2ca0d15ae..7c85c3cb4 100644 --- a/spec/models/api/openid_connect/id_token_spec.rb +++ b/spec/models/api/openid_connect/id_token_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Api::OpenidConnect::IdToken, type: :model do describe "#to_jwt" do let(:auth) { FactoryGirl.create(:auth_with_read) } diff --git a/spec/models/aspect_membership_spec.rb b/spec/models/aspect_membership_spec.rb index f57950794..6bfda4551 100644 --- a/spec/models/aspect_membership_spec.rb +++ b/spec/models/aspect_membership_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 AspectMembership, :type => :model do describe "#before_destroy" do let(:aspect) { alice.aspects.create(name: "two") } diff --git a/spec/models/aspect_spec.rb b/spec/models/aspect_spec.rb index 3ccae9515..4899a2f40 100644 --- a/spec/models/aspect_spec.rb +++ b/spec/models/aspect_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 Aspect, :type => :model do describe "creation" do let(:name) { alice.aspects.first.name } diff --git a/spec/models/aspect_visibility_spec.rb b/spec/models/aspect_visibility_spec.rb index b27b2e984..61b9aa28b 100644 --- a/spec/models/aspect_visibility_spec.rb +++ b/spec/models/aspect_visibility_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe AspectVisibility, type: :model do let(:status_message) { FactoryGirl.create(:status_message) } let(:aspect) { FactoryGirl.create(:aspect) } diff --git a/spec/models/block_spec.rb b/spec/models/block_spec.rb index 54f7317fd..e85ea6600 100644 --- a/spec/models/block_spec.rb +++ b/spec/models/block_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Block, :type => :model do describe "validations" do it "doesnt allow you to block yourself" do diff --git a/spec/models/comment_signature_spec.rb b/spec/models/comment_signature_spec.rb index 396dbb903..c669786d3 100644 --- a/spec/models/comment_signature_spec.rb +++ b/spec/models/comment_signature_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 CommentSignature, type: :model do it_behaves_like "signature data" do let(:relayable_type) { :comment } diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb index 583217755..4fe1d983b 100644 --- a/spec/models/comment_spec.rb +++ b/spec/models/comment_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 Comment, type: :model do let(:alices_aspect) { alice.aspects.first } let(:status_bob) { bob.post(:status_message, text: "hello", to: bob.aspects.first.id) } diff --git a/spec/models/contact_spec.rb b/spec/models/contact_spec.rb index 0245d1ab0..1f9318519 100644 --- a/spec/models/contact_spec.rb +++ b/spec/models/contact_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 Contact, type: :model do describe "aspect_memberships" do it "deletes dependent aspect memberships" do diff --git a/spec/models/conversation_spec.rb b/spec/models/conversation_spec.rb index 5bb08c2c1..4ec3f6140 100644 --- a/spec/models/conversation_spec.rb +++ b/spec/models/conversation_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 Conversation, :type => :model do let(:user1) { alice } let(:user2) { bob } diff --git a/spec/models/conversation_visibilities_spec.rb b/spec/models/conversation_visibilities_spec.rb index 68a77a2f9..4c968622c 100644 --- a/spec/models/conversation_visibilities_spec.rb +++ b/spec/models/conversation_visibilities_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 ConversationVisibility, type: :model do let(:user1) { alice } let(:participant_ids) { [user1.contacts.first.person.id, user1.person.id] } diff --git a/spec/models/invitation_code_spec.rb b/spec/models/invitation_code_spec.rb index 61d90583e..2912c1415 100644 --- a/spec/models/invitation_code_spec.rb +++ b/spec/models/invitation_code_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe InvitationCode, :type => :model do it 'has a valid factory' do expect(FactoryGirl.build(:invitation_code)).to be_valid diff --git a/spec/models/like_signature_spec.rb b/spec/models/like_signature_spec.rb index d31a37433..79b5228d4 100644 --- a/spec/models/like_signature_spec.rb +++ b/spec/models/like_signature_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 LikeSignature, type: :model do it_behaves_like "signature data" do let(:relayable_type) { :like } diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb index a7899355a..6236924b1 100644 --- a/spec/models/like_spec.rb +++ b/spec/models/like_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 Like, type: :model do let(:status) { bob.post(:status_message, text: "hello", to: bob.aspects.first.id) } diff --git a/spec/models/location_spec.rb b/spec/models/location_spec.rb index 94eb12a08..fe3eadfe3 100644 --- a/spec/models/location_spec.rb +++ b/spec/models/location_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Location, :type => :model do describe 'before validation' do it 'should create new location when it has coordinates' do diff --git a/spec/models/mention_spec.rb b/spec/models/mention_spec.rb index 5ea19fcfd..e0e3a2a46 100644 --- a/spec/models/mention_spec.rb +++ b/spec/models/mention_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 Mention, type: :model do describe "after destroy" do it "destroys a notification" do diff --git a/spec/models/message_spec.rb b/spec/models/message_spec.rb index ec853498c..051b384ce 100644 --- a/spec/models/message_spec.rb +++ b/spec/models/message_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 Message, type: :model do let(:create_hash) { { diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb index 6008ac5f5..392fc3940 100644 --- a/spec/models/notification_spec.rb +++ b/spec/models/notification_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 Notification, :type => :model do before do @sm = FactoryGirl.create(:status_message) diff --git a/spec/models/notifications/also_commented_spec.rb b/spec/models/notifications/also_commented_spec.rb index 72361bf03..ba57068f7 100644 --- a/spec/models/notifications/also_commented_spec.rb +++ b/spec/models/notifications/also_commented_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 Notifications::AlsoCommented, type: :model do let(:sm) { FactoryGirl.build(:status_message, author: alice.person, public: true) } let(:comment) { FactoryGirl.create(:comment, commentable: sm) } diff --git a/spec/models/notifications/mentioned_spec.rb b/spec/models/notifications/mentioned_spec.rb index cb63bb9ff..d9f05f30e 100644 --- a/spec/models/notifications/mentioned_spec.rb +++ b/spec/models/notifications/mentioned_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Notifications::Mentioned, type: :model do let(:sm) { FactoryGirl.create(:status_message, author: alice.person, text: "hi @{bob; #{bob.diaspora_handle}}", public: true) diff --git a/spec/models/notifications/private_message_spec.rb b/spec/models/notifications/private_message_spec.rb index 07916220c..4ab3b0d79 100644 --- a/spec/models/notifications/private_message_spec.rb +++ b/spec/models/notifications/private_message_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 Notifications::PrivateMessage, type: :model do let(:conversation) { conv_guid = FactoryGirl.generate(:guid) diff --git a/spec/models/notifications/reshared_spec.rb b/spec/models/notifications/reshared_spec.rb index 203ed5230..6a9cb82ab 100644 --- a/spec/models/notifications/reshared_spec.rb +++ b/spec/models/notifications/reshared_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 Notifications::Reshared, type: :model do let(:sm) { FactoryGirl.build(:status_message, author: alice.person, public: true) } let(:reshare) { FactoryGirl.build(:reshare, root: sm) } diff --git a/spec/models/notifications/started_sharing_spec.rb b/spec/models/notifications/started_sharing_spec.rb index 29fb2d4e7..4c5a094b8 100644 --- a/spec/models/notifications/started_sharing_spec.rb +++ b/spec/models/notifications/started_sharing_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Notifications::StartedSharing, type: :model do let(:contact) { alice.contact_for(bob.person) } let(:started_sharing_notification) { Notifications::StartedSharing.new(recipient: alice) } diff --git a/spec/models/open_graph_cache_spec.rb b/spec/models/open_graph_cache_spec.rb index adbf98a03..8edd764c6 100644 --- a/spec/models/open_graph_cache_spec.rb +++ b/spec/models/open_graph_cache_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 OpenGraphCache, type: :model do describe "fetch_and_save_opengraph_data!" do context "with an unsecure video url" do diff --git a/spec/models/participation_spec.rb b/spec/models/participation_spec.rb index 806c7e681..7ee4d189b 100644 --- a/spec/models/participation_spec.rb +++ b/spec/models/participation_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Participation, type: :model do let(:status) { bob.post(:status_message, text: "hello", to: bob.aspects.first.id) } diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 0c3e7649c..bb2bb7d6b 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -2,10 +2,7 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - describe Person, :type => :model do - before do @user = bob @person = FactoryGirl.create(:person) diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb index e6b9a169b..1d3ee559d 100644 --- a/spec/models/photo_spec.rb +++ b/spec/models/photo_spec.rb @@ -2,8 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - def with_carrierwave_processing(&block) UnprocessedImage.enable_processing = true val = yield diff --git a/spec/models/pod_spec.rb b/spec/models/pod_spec.rb index 771377d44..730f240e3 100644 --- a/spec/models/pod_spec.rb +++ b/spec/models/pod_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Pod, type: :model do describe ".find_or_create_by" do it "takes a url, and makes one by host" do diff --git a/spec/models/poll_answer_spec.rb b/spec/models/poll_answer_spec.rb index 4249a6af9..780f2b7b3 100644 --- a/spec/models/poll_answer_spec.rb +++ b/spec/models/poll_answer_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe PollAnswer, :type => :model do before do @status = FactoryGirl.create(:status_message_with_poll) diff --git a/spec/models/poll_participation_signature_spec.rb b/spec/models/poll_participation_signature_spec.rb index 6427d40fb..181b4d94f 100644 --- a/spec/models/poll_participation_signature_spec.rb +++ b/spec/models/poll_participation_signature_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 PollParticipationSignature, type: :model do it_behaves_like "signature data" do let(:relayable_type) { :poll_participation } diff --git a/spec/models/poll_participation_spec.rb b/spec/models/poll_participation_spec.rb index 7d79a09a5..65730481b 100644 --- a/spec/models/poll_participation_spec.rb +++ b/spec/models/poll_participation_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PollParticipation, type: :model do before do @alices_aspect = alice.aspects.first diff --git a/spec/models/poll_spec.rb b/spec/models/poll_spec.rb index 14e7af31a..30fd872bb 100644 --- a/spec/models/poll_spec.rb +++ b/spec/models/poll_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Poll, :type => :model do before do @poll = Poll.new(:question => "What do you think about apples?") diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index afd154694..fd7b44274 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_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 Post, :type => :model do describe 'scopes' do describe '.owned_or_visible_by_user' do diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb index f29d8da26..85c630bfe 100644 --- a/spec/models/profile_spec.rb +++ b/spec/models/profile_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 Profile, :type => :model do describe 'validation' do describe "of first_name" do diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index 04e4bc85a..12b843656 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_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 Report, :type => :model do before do #:report => { :item_id => @message.id, :item_type => 'post', :text => 'offensive content' } diff --git a/spec/models/reshare_spec.rb b/spec/models/reshare_spec.rb index cc436de9a..b861065ea 100644 --- a/spec/models/reshare_spec.rb +++ b/spec/models/reshare_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Reshare, type: :model do it "has a valid Factory" do expect(FactoryGirl.build(:reshare)).to be_valid diff --git a/spec/models/role_spec.rb b/spec/models/role_spec.rb index 225cd4ead..97b4424d1 100644 --- a/spec/models/role_spec.rb +++ b/spec/models/role_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Role do let!(:person) { create(:person) } let!(:admin) { create(:person) } diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb index a7aa8a3e6..b15287a38 100644 --- a/spec/models/service_spec.rb +++ b/spec/models/service_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe Service, :type => :model do - before do @post = alice.post(:status_message, :text => "hello", :to => alice.aspects.first.id) @service = Services::Facebook.new(:access_token => "yeah", :uid => 1) diff --git a/spec/models/services/facebook_spec.rb b/spec/models/services/facebook_spec.rb index 162e72ef0..ec5176b4c 100644 --- a/spec/models/services/facebook_spec.rb +++ b/spec/models/services/facebook_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe Services::Facebook, :type => :model do - before do @user = alice @post = @user.post(:status_message, :text => "hello", :to =>@user.aspects.first.id, :public =>true, :photos => []) diff --git a/spec/models/services/tumblr_spec.rb b/spec/models/services/tumblr_spec.rb index 2a8f0d71b..43113a590 100644 --- a/spec/models/services/tumblr_spec.rb +++ b/spec/models/services/tumblr_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Services::Tumblr, type: :model do let(:user) { alice } let(:post) { user.post(:status_message, text: "hello", to: user.aspects.first.id) } diff --git a/spec/models/services/twitter_spec.rb b/spec/models/services/twitter_spec.rb index b2d09cae3..79469a8c1 100644 --- a/spec/models/services/twitter_spec.rb +++ b/spec/models/services/twitter_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe Services::Twitter, :type => :model do - before do @user = alice @post = @user.post(:status_message, :text => "hello", :to =>@user.aspects.first.id, :photos => []) diff --git a/spec/models/services/wordpress_spec.rb b/spec/models/services/wordpress_spec.rb index 23ed5f69b..4b52ae34a 100644 --- a/spec/models/services/wordpress_spec.rb +++ b/spec/models/services/wordpress_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Services::Wordpress, type: :model do before do @user = alice diff --git a/spec/models/share_visibility_spec.rb b/spec/models/share_visibility_spec.rb index cd691679e..a4ba6f361 100644 --- a/spec/models/share_visibility_spec.rb +++ b/spec/models/share_visibility_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 ShareVisibility, type: :model do describe ".batch_import" do let(:post) { FactoryGirl.create(:status_message, author: alice.person) } diff --git a/spec/models/signature_order_spec.rb b/spec/models/signature_order_spec.rb index 646bbcd2e..e3d207281 100644 --- a/spec/models/signature_order_spec.rb +++ b/spec/models/signature_order_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 SignatureOrder, type: :model do context "validation" do it "requires an order" do diff --git a/spec/models/status_message_spec.rb b/spec/models/status_message_spec.rb index 674229a91..843305813 100644 --- a/spec/models/status_message_spec.rb +++ b/spec/models/status_message_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 StatusMessage, type: :model do include PeopleHelper diff --git a/spec/models/tag_following_spec.rb b/spec/models/tag_following_spec.rb index af7879215..cc159a255 100644 --- a/spec/models/tag_following_spec.rb +++ b/spec/models/tag_following_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe TagFollowing, :type => :model do before do @tag = FactoryGirl.build(:tag) diff --git a/spec/models/user/authentication_token_spec.rb b/spec/models/user/authentication_token_spec.rb index b4b4c2304..f43a41557 100644 --- a/spec/models/user/authentication_token_spec.rb +++ b/spec/models/user/authentication_token_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe User::AuthenticationToken, type: :model do describe "#reset_authentication_token!" do it "sets the authentication token" do diff --git a/spec/models/user/connecting_spec.rb b/spec/models/user/connecting_spec.rb index 8b8262dd2..455ce2143 100644 --- a/spec/models/user/connecting_spec.rb +++ b/spec/models/user/connecting_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 User::Connecting, type: :model do let(:aspect1) { alice.aspects.first } let(:aspect2) { alice.aspects.create(name: "other") } diff --git a/spec/models/user/posting_spec.rb b/spec/models/user/posting_spec.rb index 5966ba2bf..83226b16a 100644 --- a/spec/models/user/posting_spec.rb +++ b/spec/models/user/posting_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 User, :type => :model do before do @aspect = alice.aspects.first diff --git a/spec/models/user/querying_spec.rb b/spec/models/user/querying_spec.rb index 1a54d996a..471f2e32e 100644 --- a/spec/models/user/querying_spec.rb +++ b/spec/models/user/querying_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 User::Querying, :type => :model do before do @alices_aspect = alice.aspects.where(:name => "generic").first diff --git a/spec/models/user/social_actions_spec.rb b/spec/models/user/social_actions_spec.rb index 244f0f183..3f4ff57b3 100644 --- a/spec/models/user/social_actions_spec.rb +++ b/spec/models/user/social_actions_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe User::SocialActions, type: :model do let(:status) { FactoryGirl.create(:status_message, public: true, author: bob.person) } diff --git a/spec/models/user_preference_spec.rb b/spec/models/user_preference_spec.rb index 022b54db8..3f1ced13c 100644 --- a/spec/models/user_preference_spec.rb +++ b/spec/models/user_preference_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe UserPreference, :type => :model do - it 'should only allow valid email types to exist' do pref = alice.user_preferences.new(:email_type => 'not_valid') expect(pref).not_to be_valid diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 80ab08d40..da59913ce 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_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 User, :type => :model do context "relations" do context "#conversations" do diff --git a/spec/presenters/aspect_membership_presenter_spec.rb b/spec/presenters/aspect_membership_presenter_spec.rb index 86d25de66..971fdb9e4 100644 --- a/spec/presenters/aspect_membership_presenter_spec.rb +++ b/spec/presenters/aspect_membership_presenter_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe AspectMembershipPresenter do before do @am = alice.aspects.where(:name => "generic").first.aspect_memberships.first diff --git a/spec/presenters/aspect_presenter_spec.rb b/spec/presenters/aspect_presenter_spec.rb index ba2bb5b4a..74dd52a41 100644 --- a/spec/presenters/aspect_presenter_spec.rb +++ b/spec/presenters/aspect_presenter_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe AspectPresenter do before do @presenter = AspectPresenter.new(bob.aspects.first) diff --git a/spec/presenters/avatar_presenter_spec.rb b/spec/presenters/avatar_presenter_spec.rb index c819b96fc..0a7daea6a 100644 --- a/spec/presenters/avatar_presenter_spec.rb +++ b/spec/presenters/avatar_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe AvatarPresenter do describe "#base_hash" do it "calls image_url() for the avatars" do diff --git a/spec/presenters/base_presenter_spec.rb b/spec/presenters/base_presenter_spec.rb index 561d1993f..108594c01 100644 --- a/spec/presenters/base_presenter_spec.rb +++ b/spec/presenters/base_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe BasePresenter do it "falls back to nil" do p = BasePresenter.new(nil) diff --git a/spec/presenters/contact_presenter_spec.rb b/spec/presenters/contact_presenter_spec.rb index 7ac959606..dc24a0b3a 100644 --- a/spec/presenters/contact_presenter_spec.rb +++ b/spec/presenters/contact_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ContactPresenter do before do @presenter = ContactPresenter.new(alice.contact_for(bob.person), alice) diff --git a/spec/presenters/node_info_presenter_spec.rb b/spec/presenters/node_info_presenter_spec.rb index de10d4e31..6c168a8e6 100644 --- a/spec/presenters/node_info_presenter_spec.rb +++ b/spec/presenters/node_info_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe NodeInfoPresenter do let(:presenter) { NodeInfoPresenter.new("1.0") } let(:hash) { presenter.as_json.as_json } diff --git a/spec/presenters/o_embed_presenter_spec.rb b/spec/presenters/o_embed_presenter_spec.rb index bf8192675..9a14a5e7a 100644 --- a/spec/presenters/o_embed_presenter_spec.rb +++ b/spec/presenters/o_embed_presenter_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' describe OEmbedPresenter do before do @oembed = OEmbedPresenter.new(FactoryGirl.create(:status_message)) diff --git a/spec/presenters/person_presenter_spec.rb b/spec/presenters/person_presenter_spec.rb index 3dab714d1..e6c224674 100644 --- a/spec/presenters/person_presenter_spec.rb +++ b/spec/presenters/person_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PersonPresenter do let(:profile_user) { FactoryGirl.create(:user_with_aspect) } let(:person) { profile_user.person } diff --git a/spec/presenters/post_ineraction_presenter_spec.rb b/spec/presenters/post_ineraction_presenter_spec.rb index 0018bce10..c7306a37a 100644 --- a/spec/presenters/post_ineraction_presenter_spec.rb +++ b/spec/presenters/post_ineraction_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PostInteractionPresenter do let(:status_message_without_participation) { FactoryGirl.create(:status_message_without_participation) diff --git a/spec/presenters/post_presenter_spec.rb b/spec/presenters/post_presenter_spec.rb index 6bd2ca689..0c2a5c993 100644 --- a/spec/presenters/post_presenter_spec.rb +++ b/spec/presenters/post_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PostPresenter do before do @sm = FactoryGirl.create(:status_message, public: true) diff --git a/spec/presenters/profile_presenter_spec.rb b/spec/presenters/profile_presenter_spec.rb index 61829ab40..8084490e6 100644 --- a/spec/presenters/profile_presenter_spec.rb +++ b/spec/presenters/profile_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe ProfilePresenter do let(:profile) { FactoryGirl.create(:profile_with_image_url, person: alice.person) } diff --git a/spec/presenters/service_presenter_spec.rb b/spec/presenters/service_presenter_spec.rb index 046645552..997952795 100644 --- a/spec/presenters/service_presenter_spec.rb +++ b/spec/presenters/service_presenter_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe ServicePresenter do describe '#as_json' do it 'includes the provider name of the json' do diff --git a/spec/presenters/social_relay_presenter_spec.rb b/spec/presenters/social_relay_presenter_spec.rb index aa2f43395..61a80edf8 100644 --- a/spec/presenters/social_relay_presenter_spec.rb +++ b/spec/presenters/social_relay_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe SocialRelayPresenter do before do @presenter = SocialRelayPresenter.new diff --git a/spec/presenters/statistics_presenter_spec.rb b/spec/presenters/statistics_presenter_spec.rb index b76350c56..b0d1143e8 100644 --- a/spec/presenters/statistics_presenter_spec.rb +++ b/spec/presenters/statistics_presenter_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe StatisticsPresenter do before do @presenter = StatisticsPresenter.new diff --git a/spec/presenters/user_presenter_spec.rb b/spec/presenters/user_presenter_spec.rb index aa9ecf7ce..eeb463316 100644 --- a/spec/presenters/user_presenter_spec.rb +++ b/spec/presenters/user_presenter_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe UserPresenter do before do @presenter = UserPresenter.new(bob, []) diff --git a/spec/serializers/comment_serializer_spec.rb b/spec/serializers/comment_serializer_spec.rb index 36578a628..42ec79b77 100644 --- a/spec/serializers/comment_serializer_spec.rb +++ b/spec/serializers/comment_serializer_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Export::CommentSerializer do let(:comment) { create(:comment) } subject(:json_output) { Export::CommentSerializer.new(comment).to_json } diff --git a/spec/serializers/notification_serializer_spec.rb b/spec/serializers/notification_serializer_spec.rb index c771ad2b4..8f9a20a3c 100644 --- a/spec/serializers/notification_serializer_spec.rb +++ b/spec/serializers/notification_serializer_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe NotificationSerializer do let(:notifications_controller) { NotificationsController.new } diff --git a/spec/serializers/post_serializer_spec.rb b/spec/serializers/post_serializer_spec.rb index 924fe6c71..c96d42458 100644 --- a/spec/serializers/post_serializer_spec.rb +++ b/spec/serializers/post_serializer_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Export::PostSerializer do let(:post) { create(:status_message_with_photo) } subject(:json_output) { Export::PostSerializer.new(post).to_json } diff --git a/spec/services/comment_service_spec.rb b/spec/services/comment_service_spec.rb index 7717f4561..930e7c6f4 100644 --- a/spec/services/comment_service_spec.rb +++ b/spec/services/comment_service_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe CommentService do let(:post) { alice.post(:status_message, text: "hello", to: alice.aspects.first) } diff --git a/spec/services/post_service_spec.rb b/spec/services/post_service_spec.rb index 2f2d4764f..3d6b96a48 100644 --- a/spec/services/post_service_spec.rb +++ b/spec/services/post_service_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe PostService do let(:post) { alice.post(:status_message, text: "ohai", to: alice.aspects.first) } let(:public) { alice.post(:status_message, text: "hey", public: true) } diff --git a/spec/services/status_message_creation_service_spec.rb b/spec/services/status_message_creation_service_spec.rb index 617034e09..80631f266 100644 --- a/spec/services/status_message_creation_service_spec.rb +++ b/spec/services/status_message_creation_service_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe StatusMessageCreationService do describe "#create" do let(:aspect) { alice.aspects.first } diff --git a/spec/shared_behaviors/account_deletion.rb b/spec/shared_behaviors/account_deletion.rb index 1f4b655c1..48500e0d0 100644 --- a/spec/shared_behaviors/account_deletion.rb +++ b/spec/shared_behaviors/account_deletion.rb @@ -2,8 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - shared_examples_for 'it removes the person associations' do it "removes all of the person's posts" do expect(Post.where(:author_id => @person.id).count).to eq(0) diff --git a/spec/shared_behaviors/receiving.rb b/spec/shared_behaviors/receiving.rb index 78898dc8c..999147427 100644 --- a/spec/shared_behaviors/receiving.rb +++ b/spec/shared_behaviors/receiving.rb @@ -1,5 +1,3 @@ -require "spec_helper" - shared_examples_for "it ignores existing object received twice" do |klass| it "return nil if the #{klass} already exists" do expect(Diaspora::Federation::Receive.perform(entity)).not_to be_nil diff --git a/spec/shared_behaviors/relayable.rb b/spec/shared_behaviors/relayable.rb index a1e18e7f2..e50ab1161 100644 --- a/spec/shared_behaviors/relayable.rb +++ b/spec/shared_behaviors/relayable.rb @@ -2,8 +2,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require "spec_helper" - shared_examples_for "it is relayable" do describe "validations" do context "author ignored by parent author" do diff --git a/spec/shared_behaviors/signature.rb b/spec/shared_behaviors/signature.rb index 3b40d751e..389cf2838 100644 --- a/spec/shared_behaviors/signature.rb +++ b/spec/shared_behaviors/signature.rb @@ -1,5 +1,3 @@ -require "spec_helper" - shared_examples_for "signature data" do let(:relayable) { FactoryGirl.create(relayable_type) } let(:signature) { diff --git a/spec/shared_behaviors/stream.rb b/spec/shared_behaviors/stream.rb index c322f261b..91d00d513 100644 --- a/spec/shared_behaviors/stream.rb +++ b/spec/shared_behaviors/stream.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - shared_examples_for 'it is a stream' do context 'required methods for display' do it '#title' do diff --git a/spec/shared_behaviors/taggable.rb b/spec/shared_behaviors/taggable.rb index ccec40e7d..7d3dd21de 100644 --- a/spec/shared_behaviors/taggable.rb +++ b/spec/shared_behaviors/taggable.rb @@ -3,8 +3,6 @@ # licensed under the Affero General Public License version 3 or later. See # the COPYRIGHT file. -require 'spec_helper' - shared_examples_for "it is taggable" do include ActionView::Helpers::UrlHelper diff --git a/spec/workers/deferred_dispatch_spec.rb b/spec/workers/deferred_dispatch_spec.rb index 214106d8d..f39a1ac98 100644 --- a/spec/workers/deferred_dispatch_spec.rb +++ b/spec/workers/deferred_dispatch_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::DeferredDispatch do it "handles non existing records gracefully" do expect { diff --git a/spec/workers/delete_account_spec.rb b/spec/workers/delete_account_spec.rb index dd604f7d8..8c6fbff89 100644 --- a/spec/workers/delete_account_spec.rb +++ b/spec/workers/delete_account_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 Workers::DeleteAccount do describe '#perform' do it 'performs the account deletion' do diff --git a/spec/workers/delete_post_from_service_spec.rb b/spec/workers/delete_post_from_service_spec.rb index 2830ca7cd..4aee4aef7 100644 --- a/spec/workers/delete_post_from_service_spec.rb +++ b/spec/workers/delete_post_from_service_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::DeletePostFromService do it "calls service#delete_from_service with given opts" do service = double diff --git a/spec/workers/export_photos_spec.rb b/spec/workers/export_photos_spec.rb index 15db9eee4..e5ee4c47d 100644 --- a/spec/workers/export_photos_spec.rb +++ b/spec/workers/export_photos_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe Workers::ExportPhotos do - before do allow(User).to receive(:find).with(alice.id).and_return(alice) end diff --git a/spec/workers/export_user_spec.rb b/spec/workers/export_user_spec.rb index 795a9f6b8..65ebfb356 100644 --- a/spec/workers/export_user_spec.rb +++ b/spec/workers/export_user_spec.rb @@ -1,7 +1,4 @@ -require 'spec_helper' - describe Workers::ExportUser do - before do allow(User).to receive(:find).with(alice.id).and_return(alice) end diff --git a/spec/workers/fetch_profile_photo_spec.rb b/spec/workers/fetch_profile_photo_spec.rb index 0b118ce7e..66106b278 100644 --- a/spec/workers/fetch_profile_photo_spec.rb +++ b/spec/workers/fetch_profile_photo_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::FetchProfilePhoto do before do @user = alice diff --git a/spec/workers/fetch_webfinger_spec.rb b/spec/workers/fetch_webfinger_spec.rb index 0a9469c75..7a3b667fb 100644 --- a/spec/workers/fetch_webfinger_spec.rb +++ b/spec/workers/fetch_webfinger_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::FetchWebfinger do it "should webfinger and queue a job to fetch public posts" do @person = FactoryGirl.create(:person) diff --git a/spec/workers/gather_o_embed_data_spec.rb b/spec/workers/gather_o_embed_data_spec.rb index ad01e4a30..6d9fe1484 100644 --- a/spec/workers/gather_o_embed_data_spec.rb +++ b/spec/workers/gather_o_embed_data_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' describe Workers::GatherOEmbedData do before do @flickr_oembed_data = { diff --git a/spec/workers/gather_open_graph_data_spec.rb b/spec/workers/gather_open_graph_data_spec.rb index ac7c4eecd..74aefe548 100644 --- a/spec/workers/gather_open_graph_data_spec.rb +++ b/spec/workers/gather_open_graph_data_spec.rb @@ -1,4 +1,3 @@ -require 'spec_helper' describe Workers::GatherOpenGraphData do before do @ogsite_title = 'Homepage' diff --git a/spec/workers/mail/csrf_token_fail_spec.rb b/spec/workers/mail/csrf_token_fail_spec.rb index 321b06dc4..e57292048 100644 --- a/spec/workers/mail/csrf_token_fail_spec.rb +++ b/spec/workers/mail/csrf_token_fail_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 Workers::Mail::CsrfTokenFail do describe "#perfom" do it "should call .deliver on the notifier object" do diff --git a/spec/workers/mail/invite_email_spec.rb b/spec/workers/mail/invite_email_spec.rb index ef0ca75c7..70ad6a2c9 100644 --- a/spec/workers/mail/invite_email_spec.rb +++ b/spec/workers/mail/invite_email_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::Mail::InviteEmail do let(:emails) { ['foo@bar.com', 'baz@bar.com'] } let(:message) { 'get over here!' } diff --git a/spec/workers/mail/liked_spec.rb b/spec/workers/mail/liked_spec.rb index 4d91d16e7..8bb31ef0d 100644 --- a/spec/workers/mail/liked_spec.rb +++ b/spec/workers/mail/liked_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::Mail::Liked do describe "#perfom" do it "should call .deliver_now on the notifier object" do diff --git a/spec/workers/mail/mentioned_spec.rb b/spec/workers/mail/mentioned_spec.rb index 32ab738eb..e63a9dfe5 100644 --- a/spec/workers/mail/mentioned_spec.rb +++ b/spec/workers/mail/mentioned_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 Workers::Mail::Mentioned do describe '#perfom' do it 'should call .deliver on the notifier object' do diff --git a/spec/workers/mail/private_message_spec.rb b/spec/workers/mail/private_message_spec.rb index 311f7cdce..8722cd211 100644 --- a/spec/workers/mail/private_message_spec.rb +++ b/spec/workers/mail/private_message_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 Workers::Mail::PrivateMessage do describe '#perfom_delegate' do it 'should call .deliver on the notifier object' do diff --git a/spec/workers/mail/reshared_spec.rb b/spec/workers/mail/reshared_spec.rb index 74b5c43ec..fea1eb54d 100644 --- a/spec/workers/mail/reshared_spec.rb +++ b/spec/workers/mail/reshared_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 Workers::Mail::Reshared do describe '#perfom' do it 'should call .deliver on the notifier object' do diff --git a/spec/workers/post_to_service_spec.rb b/spec/workers/post_to_service_spec.rb index e75578079..1a4370b81 100644 --- a/spec/workers/post_to_service_spec.rb +++ b/spec/workers/post_to_service_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::PostToService do it 'calls service#post with the given service' do user = alice diff --git a/spec/workers/process_photo_spec.rb b/spec/workers/process_photo_spec.rb index 8e28fba74..e7bfc5312 100644 --- a/spec/workers/process_photo_spec.rb +++ b/spec/workers/process_photo_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::ProcessPhoto do before do @user = alice diff --git a/spec/workers/publish_to_hub_spec.rb b/spec/workers/publish_to_hub_spec.rb index 8af3c09bb..62656d4de 100644 --- a/spec/workers/publish_to_hub_spec.rb +++ b/spec/workers/publish_to_hub_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 Workers::PublishToHub do describe ".perform" do it "calls pubsubhubbub" do diff --git a/spec/workers/queue_users_for_removal_spec.rb b/spec/workers/queue_users_for_removal_spec.rb index e7871ccad..19c25cc0a 100644 --- a/spec/workers/queue_users_for_removal_spec.rb +++ b/spec/workers/queue_users_for_removal_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::QueueUsersForRemoval do describe 'remove_old_users is active' do before do diff --git a/spec/workers/receive_private_spec.rb b/spec/workers/receive_private_spec.rb index 86d09ed19..b4089e51c 100644 --- a/spec/workers/receive_private_spec.rb +++ b/spec/workers/receive_private_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::ReceivePrivate do let(:data) { "" } diff --git a/spec/workers/receive_public_spec.rb b/spec/workers/receive_public_spec.rb index 0f2c3aa7c..62e6a5632 100644 --- a/spec/workers/receive_public_spec.rb +++ b/spec/workers/receive_public_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::ReceivePublic do let(:data) { "" } diff --git a/spec/workers/recheck_offline_pods_spec.rb b/spec/workers/recheck_offline_pods_spec.rb index 165dd1a47..6dc59b0e5 100644 --- a/spec/workers/recheck_offline_pods_spec.rb +++ b/spec/workers/recheck_offline_pods_spec.rb @@ -1,6 +1,3 @@ - -require "spec_helper" - describe Workers::RecheckScheduledPods do it "performs a connection test on all scheduled pods" do (0..4).map { FactoryGirl.create(:pod) } diff --git a/spec/workers/recurring_pod_check_spec.rb b/spec/workers/recurring_pod_check_spec.rb index fec3b7f24..cba3c0543 100644 --- a/spec/workers/recurring_pod_check_spec.rb +++ b/spec/workers/recurring_pod_check_spec.rb @@ -1,6 +1,3 @@ - -require "spec_helper" - describe Workers::RecurringPodCheck do before do @pods = (0..4).map do diff --git a/spec/workers/remove_old_user_spec.rb b/spec/workers/remove_old_user_spec.rb index 12e0fad57..91c3efa9e 100644 --- a/spec/workers/remove_old_user_spec.rb +++ b/spec/workers/remove_old_user_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::RemoveOldUser do describe 'remove_old_users is active' do before do diff --git a/spec/workers/reset_password_spec.rb b/spec/workers/reset_password_spec.rb index f0f393f75..faf829e69 100644 --- a/spec/workers/reset_password_spec.rb +++ b/spec/workers/reset_password_spec.rb @@ -1,5 +1,3 @@ -require 'spec_helper' - describe Workers::ResetPassword do describe "#perform" do it "given a user id it sends the reset password instructions for that user" do diff --git a/spec/workers/send_base_spec.rb b/spec/workers/send_base_spec.rb index 6515faf90..5c0bb6610 100644 --- a/spec/workers/send_base_spec.rb +++ b/spec/workers/send_base_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::SendBase do it "retries first time after at least 256 seconds" do retry_delay = Workers::SendBase.new.send(:seconds_to_delay, 1) diff --git a/spec/workers/send_private_spec.rb b/spec/workers/send_private_spec.rb index 947b6c8ee..92765c0a2 100644 --- a/spec/workers/send_private_spec.rb +++ b/spec/workers/send_private_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::SendPrivate do let(:sender_id) { "any_user@example.org" } let(:obj_str) { "status_message@guid" } diff --git a/spec/workers/send_public_spec.rb b/spec/workers/send_public_spec.rb index 2bb7eb9c4..bf34c6501 100644 --- a/spec/workers/send_public_spec.rb +++ b/spec/workers/send_public_spec.rb @@ -1,5 +1,3 @@ -require "spec_helper" - describe Workers::SendPublic do let(:sender_id) { "any_user@example.org" } let(:obj_str) { "status_message@guid" }