Skip to content

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

DEV: Restore upcoming-changes specs (#39602)

Jarek Radosz5e096f06a2c6
diff --git a/spec/services/upcoming_changes/list_spec.rb b/spec/services/upcoming_changes/list_spec.rb
index 8b72efd0685..f3b886001ac 100644
--- a/spec/services/upcoming_changes/list_spec.rb
+++ b/spec/services/upcoming_changes/list_spec.rb
@@ -71,9 +71,7 @@ RSpec.describe UpcomingChanges::List do
)
end
- # NOTE (martin): Skipped for now because it is flaky on CI, it will be something to do with the
- # sample plugin settings loaded in the SiteSetting model.
- xit "includes the plugin name if the setting is from a plugin" do
+ it "includes the plugin name if the setting is from a plugin" do
results = result.upcoming_changes
sample_plugin_setting =
results.find { |change| change[:setting] == :enable_experimental_sample_plugin_feature }
diff --git a/spec/system/admin_upcoming_changes_spec.rb b/spec/system/admin_upcoming_changes_spec.rb
index ca803094863..8f1f5a49727 100644
--- a/spec/system/admin_upcoming_changes_spec.rb
+++ b/spec/system/admin_upcoming_changes_spec.rb
@@ -106,9 +106,7 @@ describe "Admin upcoming changes" do
expect(upcoming_changes_page).to have_no_change(:allow_uppercase_posts)
end
- # NOTE (martin): Skipped for now because it is flaky on CI, it will be something to do with the
- # sample plugin settings loaded in the SiteSetting model.
- xit "shows upcoming changes from plugins" do
+ it "shows upcoming changes from plugins" do
upcoming_changes_page.visit
expect(upcoming_changes_page).to have_change(:enable_experimental_sample_plugin_feature)
expect(
@@ -220,14 +218,12 @@ describe "Admin upcoming changes" do
upcoming_changes_page.filter_controls.clear_search
# Filter by plugin
- # NOTE (martin): Skipped for now because it is flaky on CI, it will be something to do with the
- # sample plugin settings loaded in the SiteSetting model.
- # upcoming_changes_page.filter_controls.type_in_search("sample plugin")
+ upcoming_changes_page.filter_controls.type_in_search("sample plugin")
- # expect(upcoming_changes_page).to have_change(:enable_experimental_sample_plugin_feature)
- # expect(upcoming_changes_page).to have_no_change(:about_page_extra_groups_show_description)
+ expect(upcoming_changes_page).to have_change(:enable_experimental_sample_plugin_feature)
+ expect(upcoming_changes_page).to have_no_change(:about_page_extra_groups_show_description)
- # upcoming_changes_page.filter_controls.clear_search
+ upcoming_changes_page.filter_controls.clear_search
upcoming_changes_page.filter_controls.toggle_dropdown_filters