mirror of
https://github.com/discourse/discourse.git
synced 2024-11-23 02:50:00 +08:00
DEV: Fix flaky specs (#13226)
Some specs failed when `LOAD_PLUGINS=1` was set while migrating the test DB and the narrative-bot plugin disabled the `send_welcome_message` site setting.
This commit is contained in:
parent
fb4dc2f35c
commit
3df928d609
|
@ -31,16 +31,15 @@ describe Onebox::Engine::InstagramOnebox do
|
|||
stub_request(:get, api_link).to_return(status: 200, body: onebox_response("instagram"))
|
||||
stub_request(:get, "https://api.instagram.com/oembed/?url=https://www.instagram.com/p/CARbvuYDm3Q")
|
||||
.to_return(status: 200, body: onebox_response("instagram"))
|
||||
@previous_options = Onebox.options.to_h
|
||||
Onebox.options = { facebook_app_access_token: access_token }
|
||||
end
|
||||
|
||||
around do |example|
|
||||
previous_options = Onebox.options.to_h
|
||||
example.run
|
||||
Onebox.options = previous_options
|
||||
after do
|
||||
Onebox.options = @previous_options
|
||||
end
|
||||
|
||||
it "includes title" do
|
||||
Onebox.options = { facebook_app_access_token: access_token }
|
||||
onebox = described_class.new(link)
|
||||
html = onebox.to_html
|
||||
|
||||
|
@ -48,7 +47,6 @@ describe Onebox::Engine::InstagramOnebox do
|
|||
end
|
||||
|
||||
it "includes image" do
|
||||
Onebox.options = { facebook_app_access_token: access_token }
|
||||
onebox = described_class.new(link)
|
||||
html = onebox.to_html
|
||||
|
||||
|
@ -62,6 +60,12 @@ describe Onebox::Engine::InstagramOnebox do
|
|||
|
||||
before do
|
||||
stub_request(:get, api_link).to_return(status: 200, body: onebox_response("instagram_old_onebox"))
|
||||
@previous_options = Onebox.options.to_h
|
||||
Onebox.options = {}
|
||||
end
|
||||
|
||||
after do
|
||||
Onebox.options = @previous_options
|
||||
end
|
||||
|
||||
it "includes title" do
|
||||
|
|
|
@ -153,6 +153,8 @@ describe User do
|
|||
let(:user) { Fabricate(:user) }
|
||||
|
||||
it 'enqueues the system message' do
|
||||
SiteSetting.send_welcome_message = true
|
||||
|
||||
expect_enqueued_with(job: :send_system_message, args: { user_id: user.id, message_type: 'welcome_user' }) do
|
||||
user.enqueue_welcome_message('welcome_user')
|
||||
end
|
||||
|
|
|
@ -64,6 +64,7 @@ describe UsersController do
|
|||
context 'valid token' do
|
||||
context 'welcome message' do
|
||||
it 'enqueues a welcome message if the user object indicates so' do
|
||||
SiteSetting.send_welcome_message = true
|
||||
user.update(active: false)
|
||||
put "/u/activate-account/#{token}"
|
||||
expect(response.status).to eq(200)
|
||||
|
|
Loading…
Reference in New Issue
Block a user