Skip to content

A platform for community discussion. Free, open, simple.

DEV: Move 4 upcoming changes to stable (#39066)

Martin Brennan0ccdd152c082
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 2e959d0e678..6fc7454974c 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -60,7 +60,8 @@ class StaticController < ApplicationController
return redirect_to path("/")
end
- if SiteSetting.login_required? && current_user.nil? && %w[faq guidelines].include?(params[:id])
+ if SiteSetting.login_required? && current_user.nil? &&
+ %w[faq guidelines rules conduct].include?(params[:id])
return redirect_to path("/login")
end
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 56a4d8260cd..dd661235978 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -4241,7 +4241,7 @@ experimental:
hidden: true
area: "experimental"
upcoming_change:
- status: "beta"
+ status: "stable"
impact: "feature,all_members"
learn_more_url: "https://meta.discourse.org/t/-/394784"
enable_new_checkbox_style:
@@ -4256,26 +4256,23 @@ experimental:
default: false
hidden: true
client: true
- area: "experimental"
upcoming_change:
impact: "feature,all_members"
- status: "beta"
+ status: "stable"
learn_more_url: "https://meta.discourse.org/t/-/395099"
enable_form_templates:
client: true
default: false
hidden: true
- area: "experimental"
upcoming_change:
- status: "beta"
+ status: "stable"
impact: "feature,all_members"
learn_more_url: "https://meta.discourse.org/t/-/278631"
impersonate_without_logout:
default: false
hidden: true
- area: "experimental"
upcoming_change:
- status: "beta"
+ status: "stable"
impact: "feature,staff"
learn_more_url: "https://meta.discourse.org/t/-/119683"
experimental_impersonation_time_limit_minutes:
diff --git a/spec/lib/seed_data/topics_spec.rb b/spec/lib/seed_data/topics_spec.rb
index ba421c7df3e..930c92b1f75 100644
--- a/spec/lib/seed_data/topics_spec.rb
+++ b/spec/lib/seed_data/topics_spec.rb
@@ -242,7 +242,11 @@ RSpec.describe SeedData::Topics do
Post.last.revise(Fabricate(:admin), title: "Changed Topic Title", raw: "Hello world")
expected_options = [
- { id: "guidelines_topic_id", name: I18n.t("guidelines_topic.title"), selected: true },
+ {
+ id: "guidelines_topic_id",
+ name: I18n.t("guidelines_topic.guidelines_title"),
+ selected: true,
+ },
{ id: "welcome_topic_id", name: "Changed Topic Title", selected: false },
]
diff --git a/spec/requests/admin/impersonate_controller_spec.rb b/spec/requests/admin/impersonate_controller_spec.rb
index d472dba16f8..fbeecb752a1 100644
--- a/spec/requests/admin/impersonate_controller_spec.rb
+++ b/spec/requests/admin/impersonate_controller_spec.rb
@@ -61,16 +61,13 @@ RSpec.describe Admin::ImpersonateController do
expect(session[:current_user_id]).to eq(admin.id)
end
- context "when using experimental impersonation feature" do
- it "raises an invalid access error if admin is already impersonating someone" do
- SiteSetting.impersonate_without_logout = true
- User.any_instance.stubs(:is_impersonating).returns(true)
+ it "raises an invalid access error if admin is already impersonating someone" do
+ User.any_instance.stubs(:is_impersonating).returns(true)
- post "/admin/impersonate.json", params: { username_or_email: user.username }
+ post "/admin/impersonate.json", params: { username_or_email: user.username }
- expect(response.status).to eq(403)
- expect(session[:current_user_id]).to eq(admin.id)
- end
+ expect(response.status).to eq(403)
+ expect(session[:current_user_id]).to eq(admin.id)
end
context "with success" do
@@ -80,13 +77,15 @@ RSpec.describe Admin::ImpersonateController do
end.to change { UserHistory.where(action: UserHistory.actions[:impersonate]).count }.by(1)
expect(response.status).to eq(200)
- expect(session[:current_user_id]).to eq(user.id)
+ expect(session[:current_user_id]).to eq(admin.id)
+ expect(admin.user_auth_tokens.last.impersonated_user_id).to eq(user.id)
end
it "also works with an email address" do
post "/admin/impersonate.json", params: { username_or_email: user.email }
expect(response.status).to eq(200)
- expect(session[:current_user_id]).to eq(user.id)
+ expect(session[:current_user_id]).to eq(admin.id)
+ expect(admin.user_auth_tokens.last.impersonated_user_id).to eq(user.id)
end
end
end
@@ -123,7 +122,6 @@ RSpec.describe Admin::ImpersonateController do
before { sign_in(admin) }
it "checks if experimental impersonation is allowed for the acting user" do
- SiteSetting.impersonate_without_logout = true
SiteSettingGroup.create!(name: "impersonate_without_logout", group_ids: "1|2")
SiteSetting.refresh!
@@ -135,25 +133,13 @@ RSpec.describe Admin::ImpersonateController do
expect(session[:current_user_id]).to eq(admin.id)
end
- it "raises a not found error when experimental impersonation is disabled" do
- SiteSetting.impersonate_without_logout = false
-
- delete "/admin/impersonate.json"
-
- expect(response.status).to eq(404)
- end
-
it "does not pass routing constraint when current user is not impersonating" do
- SiteSetting.impersonate_without_logout = true
-
delete "/admin/impersonate.json"
expect(response.status).to eq(404)
end
it "stops impersonating" do
- SiteSetting.impersonate_without_logout = true
-
post "/admin/impersonate.json", params: { username_or_email: user.username }
delete "/admin/impersonate.json"
diff --git a/spec/requests/admin/site_texts_controller_spec.rb b/spec/requests/admin/site_texts_controller_spec.rb
index 819feeb7238..dc956c15ed7 100644
--- a/spec/requests/admin/site_texts_controller_spec.rb
+++ b/spec/requests/admin/site_texts_controller_spec.rb
@@ -967,7 +967,7 @@ RSpec.describe Admin::SiteTextsController do
I18n.t("staff_category_name", locale: :de),
)
expect(Topic.find(SiteSetting.guidelines_topic_id).title).to eq(
- I18n.t("guidelines_topic.title", locale: :de),
+ I18n.t("guidelines_topic.guidelines_title", locale: :de),
)
end
end
diff --git a/spec/requests/static_controller_spec.rb b/spec/requests/static_controller_spec.rb
index 473b8559124..d80eea5fe76 100644
--- a/spec/requests/static_controller_spec.rb
+++ b/spec/requests/static_controller_spec.rb
@@ -162,9 +162,13 @@ RSpec.describe StaticController do
it "should return the right response for /faq" do
get "/faq"
+ expect(response).to redirect_to("/guidelines")
+
+ get "/guidelines"
+
expect(response.status).to eq(200)
- expect(response.body).to include(I18n.t("js.faq"))
- expect(response.body).to include("<title>FAQ - Discourse</title>")
+ expect(response.body).to include(I18n.t("js.guidelines"))
+ expect(response.body).to include("<title>Guidelines - Discourse</title>")
end
end
@@ -239,23 +243,33 @@ RSpec.describe StaticController do
get "/#{page_name}"
expect(response).to redirect_to "/login"
end
+ end
+
+ it "guidelines page loads for logged in user" do
+ sign_in(Fabricate(:user))
+
+ get "/guidelines"
- it "#{page_name} page loads for logged in user" do
+ expect(response.status).to eq(200)
+ expect(response.body).to include(I18n.t("js.guidelines"))
+ end
+
+ %w[faq rules conduct].each do |page_name|
+ it "#{page_name} page redirects to guidelines for logged in user" do
sign_in(Fabricate(:user))
get "/#{page_name}"
- expect(response.status).to eq(200)
- expect(response.body).to include(I18n.t("js.guidelines"))
+ expect(response).to redirect_to("/guidelines")
end
end
end
context "with crawler view" do
it "should include correct title" do
- get "/faq", headers: { "HTTP_USER_AGENT" => "Googlebot" }
+ get "/guidelines", headers: { "HTTP_USER_AGENT" => "Googlebot" }
expect(response.status).to eq(200)
- expect(response.body).to include("<title>FAQ - Discourse</title>")
+ expect(response.body).to include("<title>Guidelines - Discourse</title>")
end
end
@@ -293,13 +307,13 @@ RSpec.describe StaticController do
current_user&.locale == "pl" ? "test_some_other_topic_id" : "test_some_topic_id"
end
- get "/faq"
+ get "/guidelines"
expect(response.status).to eq(200)
expect(response.body).to include("Regular FAQ")
sign_in(Fabricate(:user, locale: "pl"))
- get "/faq"
+ get "/guidelines"
expect(response.status).to eq(200)
expect(response.body).to include("Polish FAQ")
diff --git a/spec/system/user_page/user_preferences_profile_spec.rb b/spec/system/user_page/user_preferences_profile_spec.rb
index f7d00e3677c..322b8afa01b 100644
--- a/spec/system/user_page/user_preferences_profile_spec.rb
+++ b/spec/system/user_page/user_preferences_profile_spec.rb
@@ -66,7 +66,7 @@ describe "User preferences | Profile" do
it "client-side redirects to the profile page to fill up required fields" do
visit("/faq")
- expect(page).to have_current_path("/faq")
+ expect(page).to have_current_path("/guidelines")
click_logo