about summary refs log tree commit diff
path: root/spec/controllers/settings/exports
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-03-28 12:43:58 +0200
committerGitHub <noreply@github.com>2022-03-28 12:43:58 +0200
commit30658924a80434e6a2bceb61267b911ea8d37898 (patch)
tree2b461a8191e566a06370682c9e872d329beb7fa4 /spec/controllers/settings/exports
parent56edc6552f71a1f58fd8ca5ea2f0603015be0c2c (diff)
Fix test-related issues (#17888)
* Remove obsolete RSS::Serializer test

Since #17828, RSS::Serializer no longer has specific code for deleted statuses,
but it is never called on deleted statuses anyway.

* Rename erroneously-named test files

* Fix failing test

* Fix test deprecation warnings

* Update CircleCI Ruby orb

1.4.0 has a bug that does not match all the test files due to incorrect
globbing
Diffstat (limited to 'spec/controllers/settings/exports')
-rw-r--r--spec/controllers/settings/exports/bookmarks_controller_spec.rb (renamed from spec/controllers/settings/exports/bookmarks_controller_specs.rb)11
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/controllers/settings/exports/bookmarks_controller_specs.rb b/spec/controllers/settings/exports/bookmarks_controller_spec.rb
index 85761577b..a06c02e0c 100644
--- a/spec/controllers/settings/exports/bookmarks_controller_specs.rb
+++ b/spec/controllers/settings/exports/bookmarks_controller_spec.rb
@@ -3,11 +3,16 @@ require 'rails_helper'
 describe Settings::Exports::BookmarksController do
   render_views
 
+  let(:user)    { Fabricate(:user) }
+  let(:account) { Fabricate(:account, domain: 'foo.bar') }
+  let(:status)  { Fabricate(:status, account: account, uri: 'https://foo.bar/statuses/1312') }
+
   describe 'GET #index' do
-    it 'returns a csv of the bookmarked toots' do
-      user = Fabricate(:user)
-      user.account.bookmarks.create!(status: Fabricate(:status, uri: 'https://foo.bar/statuses/1312'))
+    before do
+      user.account.bookmarks.create!(status: status)
+    end
 
+    it 'returns a csv of the bookmarked toots' do
       sign_in user, scope: :user
       get :index, format: :csv