From d56346982f7d46ccc497a0c8f44ed7e6e502ce94 Mon Sep 17 00:00:00 2001 From: Ted Johansson Date: Tue, 17 Dec 2024 14:08:40 +0800 Subject: [PATCH] DEV: Fix controller tests failing in parallel suite only (#30314) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These controller tests are passing locally and in CI, but are failing the build when run in parallel. I managed to recreate the failures by running the entire suite with turbo_spec and the right seed locally. After these changes, the parallel suite passes locally as well. 🤞 --- spec/requests/session_controller_spec.rb | 2 ++ spec/requests/users_controller_spec.rb | 6 ++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/requests/session_controller_spec.rb b/spec/requests/session_controller_spec.rb index 492a1a340ea..cb7d0f9f9c6 100644 --- a/spec/requests/session_controller_spec.rb +++ b/spec/requests/session_controller_spec.rb @@ -16,6 +16,8 @@ RSpec.describe SessionController do end end + before { SiteSetting.hide_email_address_taken = false } + describe "#email_login_info" do let(:email_token) do Fabricate(:email_token, user: user, scope: EmailToken.scopes[:email_login]) diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rb index e87d4a4bef6..45b2109b2dc 100644 --- a/spec/requests/users_controller_spec.rb +++ b/spec/requests/users_controller_spec.rb @@ -19,6 +19,8 @@ RSpec.describe UsersController do # late for fab! to work. let(:user_deferred) { Fabricate(:user, refresh_auto_groups: true) } + before { SiteSetting.hide_email_address_taken = false } + describe "#full account registration flow" do it "will correctly handle honeypot and challenge" do get "/session/hp.json" @@ -1013,8 +1015,6 @@ RSpec.describe UsersController do end context "when creating as active" do - before { SiteSetting.hide_email_address_taken = false } - it "won't create the user as active" do post "/u.json", params: post_user_params.merge(active: true) expect(response.status).to eq(200) @@ -2044,8 +2044,6 @@ RSpec.describe UsersController do end describe "#check_email" do - before { SiteSetting.hide_email_address_taken = false } - it "returns success if hide_email_address_taken is true" do SiteSetting.hide_email_address_taken = true