From ad44243a57f4f0d3c5856521eca55e88a3123d91 Mon Sep 17 00:00:00 2001 From: Daniel Waterworth Date: Mon, 29 Apr 2019 07:08:56 +0000 Subject: [PATCH] Removed unused let blocks (#7446) The bodies of these blocks were never evaluated. --- spec/components/filter_best_posts_spec.rb | 2 -- spec/components/guardian_spec.rb | 2 -- spec/components/pinned_check_spec.rb | 1 - spec/components/pretty_text_spec.rb | 1 - spec/components/s3_inventory_spec.rb | 1 - spec/components/site_settings/type_supervisor_spec.rb | 3 --- spec/components/topic_query_spec.rb | 2 -- spec/components/validators/email_validator_spec.rb | 5 ----- spec/integration/category_tag_spec.rb | 1 - spec/jobs/bulk_invite_spec.rb | 1 - spec/jobs/clean_up_uploads_spec.rb | 2 -- spec/jobs/enqueue_digest_emails_spec.rb | 1 - spec/jobs/poll_feed_spec.rb | 1 - spec/jobs/poll_mailbox_spec.rb | 2 -- spec/models/post_spec.rb | 1 - spec/models/reviewable_spec.rb | 1 - spec/models/tag_user_spec.rb | 5 ----- spec/models/topic_spec.rb | 1 - spec/models/topic_user_spec.rb | 1 - spec/models/upload_spec.rb | 10 ---------- spec/multisite/jobs_spec.rb | 2 -- spec/requests/admin/backups_controller_spec.rb | 1 - spec/requests/categories_controller_spec.rb | 4 ---- spec/requests/embed_controller_spec.rb | 1 - spec/requests/export_csv_controller_spec.rb | 2 -- spec/requests/list_controller_spec.rb | 3 --- spec/requests/posts_controller_spec.rb | 1 - spec/requests/session_controller_spec.rb | 1 - spec/requests/topics_controller_spec.rb | 3 --- spec/requests/users_controller_spec.rb | 3 --- spec/serializers/basic_group_serializer_spec.rb | 6 ------ spec/services/topic_timestamp_changer_spec.rb | 1 - spec/services/user_authenticator_spec.rb | 1 - spec/services/user_merger_spec.rb | 1 - 34 files changed, 74 deletions(-) diff --git a/spec/components/filter_best_posts_spec.rb b/spec/components/filter_best_posts_spec.rb index 532c1f4c5fd..62fab56cbc4 100644 --- a/spec/components/filter_best_posts_spec.rb +++ b/spec/components/filter_best_posts_spec.rb @@ -8,8 +8,6 @@ describe FilterBestPosts do let(:coding_horror) { Fabricate(:coding_horror) } let(:first_poster) { topic.user } - let(:topic_view) { TopicView.new(topic.id, coding_horror) } - let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1) } let!(:p2) { Fabricate(:post, topic: topic, user: coding_horror, percent_rank: 0.5) } let!(:p3) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 0) } diff --git a/spec/components/guardian_spec.rb b/spec/components/guardian_spec.rb index afe260661b3..a6b1eeec979 100644 --- a/spec/components/guardian_spec.rb +++ b/spec/components/guardian_spec.rb @@ -1181,8 +1181,6 @@ describe Guardian do end context 'as a moderator' do - let(:other_post) { Fabricate(:post, topic: topic, user: topic.user) } - before do topic.save! post.save! diff --git a/spec/components/pinned_check_spec.rb b/spec/components/pinned_check_spec.rb index edaba3218f2..b8b9dc2ba49 100644 --- a/spec/components/pinned_check_spec.rb +++ b/spec/components/pinned_check_spec.rb @@ -21,7 +21,6 @@ describe PinnedCheck do context "with a topic_user record" do let(:user) { Fabricate.build(:user) } - let(:unpinned_topic_user) { Fabricate.build(:topic_user, user: user, topic: unpinned_topic) } describe "unpinned topic" do let(:topic_user) { TopicUser.new(topic: unpinned_topic, user: user) } diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index b76a253b84b..1c780e8a5c3 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -16,7 +16,6 @@ describe PrettyText do end let(:wrapped_image) { "
\nScreen Shot 2014-04-14 at 9.47.10 PM.png966x737 1.47 MB\n
" } - let(:wrapped_image_excerpt) {} describe "Quoting" do diff --git a/spec/components/s3_inventory_spec.rb b/spec/components/s3_inventory_spec.rb index b6734641619..f4da2670f3f 100644 --- a/spec/components/s3_inventory_spec.rb +++ b/spec/components/s3_inventory_spec.rb @@ -6,7 +6,6 @@ require "file_store/s3_store" describe "S3Inventory" do let(:client) { Aws::S3::Client.new(stub_responses: true) } let(:helper) { S3Helper.new(SiteSetting.Upload.s3_upload_bucket.downcase, "", client: client) } - let(:store) { FileStore::S3Store.new(helper) } let(:inventory) { S3Inventory.new(helper, :upload) } let(:csv_filename) { "#{Rails.root}/spec/fixtures/csv/s3_inventory.csv" } diff --git a/spec/components/site_settings/type_supervisor_spec.rb b/spec/components/site_settings/type_supervisor_spec.rb index 692923f8c65..f795d824434 100644 --- a/spec/components/site_settings/type_supervisor_spec.rb +++ b/spec/components/site_settings/type_supervisor_spec.rb @@ -233,9 +233,6 @@ describe SiteSettings::TypeSupervisor do end describe '#to_rb_value' do - let(:true_val) { 't' } - let(:false_val) { 'f' } - it 'the type can be overriden by a parameter' do expect(settings.type_supervisor.to_rb_value(:type_null, '1', SiteSetting.types[:integer])).to eq(1) end diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb index 31138e6c318..ad375ed36be 100644 --- a/spec/components/topic_query_spec.rb +++ b/spec/components/topic_query_spec.rb @@ -525,8 +525,6 @@ describe TopicQuery do end context 'preload api' do - let(:topics) {} - it "preloads data correctly" do TopicList.preloaded_custom_fields << "tag" TopicList.preloaded_custom_fields << "age" diff --git a/spec/components/validators/email_validator_spec.rb b/spec/components/validators/email_validator_spec.rb index 36a4202d62b..9e52e83f6b8 100644 --- a/spec/components/validators/email_validator_spec.rb +++ b/spec/components/validators/email_validator_spec.rb @@ -1,11 +1,6 @@ require 'rails_helper' describe EmailValidator do - - let(:record) {} - let(:validator) { described_class.new(attributes: :email) } - subject(:validate) { validator.validate_each(record, :email, record.email) } - def blocks?(email) user = Fabricate.build(:user, email: email) validator = EmailValidator.new(attributes: :email) diff --git a/spec/integration/category_tag_spec.rb b/spec/integration/category_tag_spec.rb index e855786a6cf..d29b2f2147f 100644 --- a/spec/integration/category_tag_spec.rb +++ b/spec/integration/category_tag_spec.rb @@ -289,7 +289,6 @@ describe "category tag restrictions" do end describe "tag topic counts per category" do - let(:user) { Fabricate(:user) } let(:admin) { Fabricate(:admin) } let(:category) { Fabricate(:category) } let(:category2) { Fabricate(:category) } diff --git a/spec/jobs/bulk_invite_spec.rb b/spec/jobs/bulk_invite_spec.rb index bf3b7ead035..736d6f0ed0b 100644 --- a/spec/jobs/bulk_invite_spec.rb +++ b/spec/jobs/bulk_invite_spec.rb @@ -8,7 +8,6 @@ describe Jobs::BulkInvite do let!(:group2) { Fabricate(:group, name: 'group2') } let!(:topic) { Fabricate(:topic, id: 999) } let(:email) { "test@discourse.org" } - let(:csv_info) { [] } let(:basename) { "bulk_invite.csv" } let(:filename) { "#{Invite.base_directory}/#{basename}" } diff --git a/spec/jobs/clean_up_uploads_spec.rb b/spec/jobs/clean_up_uploads_spec.rb index bcd29663b04..645b7a17fef 100644 --- a/spec/jobs/clean_up_uploads_spec.rb +++ b/spec/jobs/clean_up_uploads_spec.rb @@ -8,8 +8,6 @@ describe Jobs::CleanUpUploads do Fabricate(:upload, { created_at: 2.hours.ago }.merge(attributes)) end - let(:upload) { fabricate_upload } - before do SiteSetting.clean_up_uploads = true SiteSetting.clean_orphan_uploads_grace_period_hours = 1 diff --git a/spec/jobs/enqueue_digest_emails_spec.rb b/spec/jobs/enqueue_digest_emails_spec.rb index d4687932ad0..e408676bc66 100644 --- a/spec/jobs/enqueue_digest_emails_spec.rb +++ b/spec/jobs/enqueue_digest_emails_spec.rb @@ -74,7 +74,6 @@ describe Jobs::EnqueueDigestEmails do context 'visited the site this week' do let(:user_visited_this_week) { Fabricate(:active_user, last_seen_at: 6.days.ago) } - let(:user_visited_this_week_email_always) { Fabricate(:active_user, last_seen_at: 6.days.ago, email_level: UserOption.email_level_types[:always]) } it "doesn't return users who have been emailed recently" do user = user_visited_this_week diff --git a/spec/jobs/poll_feed_spec.rb b/spec/jobs/poll_feed_spec.rb index 8b151c73bfa..830648d9faf 100644 --- a/spec/jobs/poll_feed_spec.rb +++ b/spec/jobs/poll_feed_spec.rb @@ -6,7 +6,6 @@ describe Jobs::PollFeed do context "execute" do let(:url) { "http://eviltrout.com" } - let(:embed_by_username) { "eviltrout" } before do $redis.del("feed-polled-recently") diff --git a/spec/jobs/poll_mailbox_spec.rb b/spec/jobs/poll_mailbox_spec.rb index d9c7d485f41..b4efaff95ec 100644 --- a/spec/jobs/poll_mailbox_spec.rb +++ b/spec/jobs/poll_mailbox_spec.rb @@ -24,8 +24,6 @@ describe Jobs::PollMailbox do describe ".poll_pop3" do context "pop errors" do - let(:user) { Fabricate(:user) } - before do Discourse.expects(:handle_job_exception).at_least_once end diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 96eb5c7bae4..8b242454674 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -403,7 +403,6 @@ describe Post do context "with a previous host" do - let(:user) { old_post.newuser } let(:another_disney_link) { post_with_body("[radiator springs](http://disneyland.disney.go.com/disney-california-adventure/radiator-springs-racers/)", newuser) } before do diff --git a/spec/models/reviewable_spec.rb b/spec/models/reviewable_spec.rb index 8b8ae2ea1b6..6b855c93a1e 100644 --- a/spec/models/reviewable_spec.rb +++ b/spec/models/reviewable_spec.rb @@ -7,7 +7,6 @@ RSpec.describe Reviewable, type: :model do let(:user) { Fabricate(:user) } let(:reviewable) { Fabricate.build(:reviewable, created_by: admin) } - let(:queued_post) { Fabricate.build(:reviewable_queued_post) } it "can create a reviewable object" do expect(reviewable).to be_present diff --git a/spec/models/tag_user_spec.rb b/spec/models/tag_user_spec.rb index dc1141692c0..555277c6f67 100644 --- a/spec/models/tag_user_spec.rb +++ b/spec/models/tag_user_spec.rb @@ -83,11 +83,6 @@ describe TagUser do create_post(tags: [watched_tag.name]) end - let :muted_post do - TagUser.create!(user: user, tag: muted_tag, notification_level: TagUser.notification_levels[:muted]) - create_post(tags: [muted_tag.name]) - end - let :tracked_post do TagUser.create!(user: user, tag: tracked_tag, notification_level: TagUser.notification_levels[:tracking]) create_post(tags: [tracked_tag.name]) diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index e4611b31b83..50d5a86c4f0 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -737,7 +737,6 @@ describe Topic do context 'invite' do context 'existing user' do - let(:walter) { Fabricate(:walter_white) } context 'by group name' do let(:group) { Fabricate(:group) } diff --git a/spec/models/topic_user_spec.rb b/spec/models/topic_user_spec.rb index be49ab45399..6b348b73725 100644 --- a/spec/models/topic_user_spec.rb +++ b/spec/models/topic_user_spec.rb @@ -83,7 +83,6 @@ describe TopicUser do let(:topic_user) { TopicUser.get(topic, user) } let(:topic_creator_user) { TopicUser.get(topic, topic.user) } - let(:post) { Fabricate(:post, topic: topic, user: user) } let(:new_user) { u = Fabricate(:user) u.user_option.update_columns(auto_track_topics_after_msecs: 1000) diff --git a/spec/models/upload_spec.rb b/spec/models/upload_spec.rb index 09d9078800c..493255976e1 100644 --- a/spec/models/upload_spec.rb +++ b/spec/models/upload_spec.rb @@ -3,28 +3,20 @@ require 'rails_helper' describe Upload do let(:upload) { build(:upload) } - let(:thumbnail) { build(:optimized_image, upload: upload) } let(:user_id) { 1 } - let(:url) { "http://domain.com" } let(:image_filename) { "logo.png" } let(:image) { file_from_fixtures(image_filename) } - let(:image_filesize) { File.size(image) } - let(:image_sha1) { Upload.generate_digest(image) } let(:image_svg_filename) { "image.svg" } let(:image_svg) { file_from_fixtures(image_svg_filename) } - let(:image_svg_filesize) { File.size(image_svg) } let(:huge_image_filename) { "huge.jpg" } let(:huge_image) { file_from_fixtures(huge_image_filename) } - let(:huge_image_filesize) { File.size(huge_image) } let(:attachment_path) { __FILE__ } let(:attachment) { File.new(attachment_path) } - let(:attachment_filename) { File.basename(attachment_path) } - let(:attachment_filesize) { File.size(attachment_path) } context ".create_thumbnail!" do @@ -202,8 +194,6 @@ describe Upload do end describe 'when upload bucket contains subfolder' do - let(:url) { "#{SiteSetting.Upload.absolute_base_url}/path/path2#{path}" } - before do SiteSetting.s3_upload_bucket = "s3-upload-bucket/path/path2" end diff --git a/spec/multisite/jobs_spec.rb b/spec/multisite/jobs_spec.rb index 943f33642ca..7fbbe33f4c3 100644 --- a/spec/multisite/jobs_spec.rb +++ b/spec/multisite/jobs_spec.rb @@ -1,8 +1,6 @@ require 'rails_helper' RSpec.describe "Running Sidekiq Jobs in Multisite", type: :multisite do - let(:conn) { RailsMultisite::ConnectionManagement } - it 'should revert back to the default connection' do expect do Jobs::DestroyOldDeletionStubs.new.perform({}) diff --git a/spec/requests/admin/backups_controller_spec.rb b/spec/requests/admin/backups_controller_spec.rb index 96a7b63c490..1b663babd0c 100644 --- a/spec/requests/admin/backups_controller_spec.rb +++ b/spec/requests/admin/backups_controller_spec.rb @@ -4,7 +4,6 @@ RSpec.describe Admin::BackupsController do let(:admin) { Fabricate(:admin) } let(:backup_filename) { "2014-02-10-065935.tar.gz" } let(:backup_filename2) { "2014-02-11-065935.tar.gz" } - let(:store) { BackupRestore::LocalBackupStore.new } def create_backup_files(*filenames) @paths = filenames.map do |filename| diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb index b94ef713cfb..16bdb95f321 100644 --- a/spec/requests/categories_controller_spec.rb +++ b/spec/requests/categories_controller_spec.rb @@ -251,8 +251,6 @@ describe CategoriesController do end describe "logged in" do - let(:valid_attrs) { { id: category.id, name: "hello", color: "ff0", text_color: "fff" } } - before do sign_in(admin) end @@ -399,8 +397,6 @@ describe CategoriesController do end describe 'logged in' do - let(:valid_attrs) { { id: category.id, slug: 'fff' } } - before do sign_in(admin) end diff --git a/spec/requests/embed_controller_spec.rb b/spec/requests/embed_controller_spec.rb index 18fd064bac1..aadad5b7d8c 100644 --- a/spec/requests/embed_controller_spec.rb +++ b/spec/requests/embed_controller_spec.rb @@ -2,7 +2,6 @@ require 'rails_helper' describe EmbedController do - let(:host) { "eviltrout.com" } let(:embed_url) { "http://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" } let(:embed_url_secure) { "https://eviltrout.com/2013/02/10/why-discourse-uses-emberjs.html" } let(:discourse_username) { "eviltrout" } diff --git a/spec/requests/export_csv_controller_spec.rb b/spec/requests/export_csv_controller_spec.rb index eec3c6bbb33..dc0c9e40fc4 100644 --- a/spec/requests/export_csv_controller_spec.rb +++ b/spec/requests/export_csv_controller_spec.rb @@ -1,8 +1,6 @@ require "rails_helper" describe ExportCsvController do - let(:export_filename) { "user-archive-codinghorror-150115-234817-999.csv.gz" } - context "while logged in as normal user" do let(:user) { Fabricate(:user) } before { sign_in(user) } diff --git a/spec/requests/list_controller_spec.rb b/spec/requests/list_controller_spec.rb index e15ca638d92..afa4d58dc99 100644 --- a/spec/requests/list_controller_spec.rb +++ b/spec/requests/list_controller_spec.rb @@ -4,7 +4,6 @@ RSpec.describe ListController do let(:topic) { Fabricate(:topic, user: user) } let(:group) { Fabricate(:group) } let(:user) { Fabricate(:user) } - let(:post) { Fabricate(:post, user: user) } let(:admin) { Fabricate(:admin) } before do @@ -200,8 +199,6 @@ RSpec.describe ListController do ) end - let(:private_post) { Fabricate(:post, topic: topic) } - it 'should return the right response' do get "/topics/private-messages-group/#{user.username}/#{group.name}.json" diff --git a/spec/requests/posts_controller_spec.rb b/spec/requests/posts_controller_spec.rb index d8e8b82e040..534229d2415 100644 --- a/spec/requests/posts_controller_spec.rb +++ b/spec/requests/posts_controller_spec.rb @@ -277,7 +277,6 @@ describe PostsController do describe 'when logged in' do let(:user) { Fabricate(:user) } - let(:post) { Fabricate(:post, user: user, post_number: 2) } it "raises an error when the user doesn't have permission to see the post" do post = Fabricate(:post, topic: Fabricate(:private_message_topic), post_number: 3) diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb index d16442a34b7..37c2538dda4 100644 --- a/spec/requests/session_controller_spec.rb +++ b/spec/requests/session_controller_spec.rb @@ -1145,7 +1145,6 @@ RSpec.describe SessionController do end context 'when admins are restricted by ip address' do - let(:permitted_ip_address) { '111.234.23.11' } before do SiteSetting.use_admin_ip_whitelist = true ScreenedIpAddress.all.destroy_all diff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rb index 9c22a00e9cf..5a22da7b7fe 100644 --- a/spec/requests/topics_controller_spec.rb +++ b/spec/requests/topics_controller_spec.rb @@ -336,7 +336,6 @@ RSpec.describe TopicsController do let(:trust_level_4) { Fabricate(:trust_level_4) } let(:evil_trout) { Fabricate(:evil_trout) } let(:message) { Fabricate(:private_message_topic) } - let(:p1) { Fabricate(:post, user: user, post_number: 1, topic: message) } let(:p2) { Fabricate(:post, user: evil_trout, post_number: 2, topic: message) } let(:dest_message) do @@ -2580,7 +2579,6 @@ RSpec.describe TopicsController do describe 'shared drafts' do let(:shared_drafts_category) { Fabricate(:category) } - let(:category) { Fabricate(:category) } before do SiteSetting.shared_drafts_category = shared_drafts_category.id @@ -2629,7 +2627,6 @@ RSpec.describe TopicsController do let(:category) { Fabricate(:category) } let(:topic) { Fabricate(:topic, category: shared_drafts_category, visible: false) } let!(:post) { Fabricate(:post, topic: topic) } - let(:shared_draft) { Fabricate(:shared_draft, topic: topic, category: category) } let(:moderator) { Fabricate(:moderator) } it "fails for anonymous users" do diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index 521ce83e94f..eece747de99 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -832,8 +832,6 @@ describe UsersController do end context 'authentication records for' do - let(:user) { Fabricate(:user) } - before do OmniAuth.config.test_mode = true @@ -2574,7 +2572,6 @@ describe UsersController do describe '#show' do context "anon" do let(:user) { Discourse.system_user } - let(:other_user) { Fabricate(:user) } it "returns success" do get "/u/#{user.username}.json" diff --git a/spec/serializers/basic_group_serializer_spec.rb b/spec/serializers/basic_group_serializer_spec.rb index cdbd5236d6f..1ba1f276a54 100644 --- a/spec/serializers/basic_group_serializer_spec.rb +++ b/spec/serializers/basic_group_serializer_spec.rb @@ -31,12 +31,6 @@ describe BasicGroupSerializer do end describe 'group owner' do - let(:user) do - user = Fabricate(:user) - group.add_owner(user) - user - end - it 'should include bio_raw' do expect(subject.as_json[:bio_raw]).to eq('testing') end diff --git a/spec/services/topic_timestamp_changer_spec.rb b/spec/services/topic_timestamp_changer_spec.rb index 1cc740dab2e..2c61a45c84b 100644 --- a/spec/services/topic_timestamp_changer_spec.rb +++ b/spec/services/topic_timestamp_changer_spec.rb @@ -3,7 +3,6 @@ require 'rails_helper' describe TopicTimestampChanger do describe "change!" do let(:old_timestamp) { Time.zone.now } - let(:new_timestamp) { old_timestamp + 1.day } let(:topic) { Fabricate(:topic, created_at: old_timestamp) } let!(:p1) { Fabricate(:post, topic: topic, created_at: old_timestamp) } let!(:p2) { Fabricate(:post, topic: topic, created_at: old_timestamp + 1.day) } diff --git a/spec/services/user_authenticator_spec.rb b/spec/services/user_authenticator_spec.rb index 3590711a32d..1c8f05d04d4 100644 --- a/spec/services/user_authenticator_spec.rb +++ b/spec/services/user_authenticator_spec.rb @@ -19,7 +19,6 @@ end describe UserAuthenticator do context "#finish" do - let(:authenticator) { Auth::GithubAuthenticator.new } let(:group) { Fabricate(:group, automatic_membership_email_domains: "discourse.org") } before do diff --git a/spec/services/user_merger_spec.rb b/spec/services/user_merger_spec.rb index 2eefbf9a62e..7243191b00c 100644 --- a/spec/services/user_merger_spec.rb +++ b/spec/services/user_merger_spec.rb @@ -677,7 +677,6 @@ describe UserMerger do let(:post1) { Fabricate(:post) } let(:post2) { Fabricate(:post) } - let(:post3) { Fabricate(:post) } def log_like_action(acting_user, user, post) UserAction.log_action!(action_type: UserAction::LIKE,