Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.
This commit is contained in:
@ -194,7 +194,9 @@ RSpec.describe Remotable do
|
||||
let(:error_class) { error_class }
|
||||
|
||||
it 'calls Rails.logger.debug' do
|
||||
expect(Rails.logger).to receive(:debug).with(/^Error fetching remote #{hoge}: /)
|
||||
expect(Rails.logger).to receive(:debug) do |&block|
|
||||
expect(block.call).to match(/^Error fetching remote #{hoge}: /)
|
||||
end
|
||||
foo.hoge_remote_url = url
|
||||
end
|
||||
end
|
||||
|
@ -118,8 +118,8 @@ RSpec.describe SessionActivation, type: :model do
|
||||
let(:id) { '1' }
|
||||
|
||||
it 'calls where.destroy_all' do
|
||||
expect(described_class).to receive_message_chain(:where, :destroy_all)
|
||||
.with('session_id != ?', id).with(no_args)
|
||||
expect(described_class).to receive_message_chain(:where, :not, :destroy_all)
|
||||
.with(session_id: id).with(no_args)
|
||||
|
||||
described_class.exclusive(id)
|
||||
end
|
||||
|
Reference in New Issue
Block a user