From 10d6494de9e5a506b4093047121ddd3c66544235 Mon Sep 17 00:00:00 2001 From: James Smith Date: Fri, 9 Aug 2024 11:26:42 +0100 Subject: [PATCH] mode demo mode check in specs into metadata --- spec/requests/admin/collections_spec.rb | 3 +-- spec/requests/admin/creators_spec.rb | 3 +-- spec/requests/admin/dashboard_spec.rb | 3 +-- spec/requests/admin/link_spec.rb | 3 +-- spec/requests/admin/log_spec.rb | 3 +-- spec/requests/admin/model_files_spec.rb | 3 +-- spec/requests/admin/models_spec.rb | 3 +-- spec/requests/admin/problem_spec.rb | 3 +-- spec/requests/admin/tags_spec.rb | 3 +-- spec/support/features.rb | 9 +++++++++ spec/support/multiuser.rb | 6 ------ 11 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 spec/support/features.rb delete mode 100644 spec/support/multiuser.rb diff --git a/spec/requests/admin/collections_spec.rb b/spec/requests/admin/collections_spec.rb index d4dd74ff2..a6f82a971 100644 --- a/spec/requests/admin/collections_spec.rb +++ b/spec/requests/admin/collections_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Collections" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/collections") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/creators_spec.rb b/spec/requests/admin/creators_spec.rb index 5aeb9195b..07c2e6bf4 100644 --- a/spec/requests/admin/creators_spec.rb +++ b/spec/requests/admin/creators_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Creators" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/creators") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/dashboard_spec.rb b/spec/requests/admin/dashboard_spec.rb index e525973d0..d0f3c117a 100644 --- a/spec/requests/admin/dashboard_spec.rb +++ b/spec/requests/admin/dashboard_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Dashboard" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/link_spec.rb b/spec/requests/admin/link_spec.rb index 0c9538e03..2d3857b8b 100644 --- a/spec/requests/admin/link_spec.rb +++ b/spec/requests/admin/link_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Links" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/links") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/log_spec.rb b/spec/requests/admin/log_spec.rb index 686a6d814..481e5e084 100644 --- a/spec/requests/admin/log_spec.rb +++ b/spec/requests/admin/log_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Log" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/log") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/model_files_spec.rb b/spec/requests/admin/model_files_spec.rb index 9ddb738c3..8247a55e1 100644 --- a/spec/requests/admin/model_files_spec.rb +++ b/spec/requests/admin/model_files_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Model_Files" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/model_files") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/models_spec.rb b/spec/requests/admin/models_spec.rb index cbeff7e6f..86922a5df 100644 --- a/spec/requests/admin/models_spec.rb +++ b/spec/requests/admin/models_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Models" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/models") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/problem_spec.rb b/spec/requests/admin/problem_spec.rb index 2c9368882..ee40bc59c 100644 --- a/spec/requests/admin/problem_spec.rb +++ b/spec/requests/admin/problem_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Problems" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/problems") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/requests/admin/tags_spec.rb b/spec/requests/admin/tags_spec.rb index 4f6458c2a..cf21b935d 100644 --- a/spec/requests/admin/tags_spec.rb +++ b/spec/requests/admin/tags_spec.rb @@ -12,8 +12,7 @@ RSpec.describe "Admin::Tags" do expect(response).to have_http_status(:success) end - it "is inaccessible in demo mode" do - Flipper.enable :demo_mode + it "is inaccessible in demo mode", :demo_mode do expect { get("/admin/acts_as_taggable_on_tags") }.to raise_error(Pundit::NotAuthorizedError) end end diff --git a/spec/support/features.rb b/spec/support/features.rb new file mode 100644 index 000000000..703e72e88 --- /dev/null +++ b/spec/support/features.rb @@ -0,0 +1,9 @@ +RSpec.configure do |config| + config.before(:each, :multiuser) do + allow(SiteSettings).to receive(:multiuser_enabled?).and_return(true) + end + + config.before(:each, :demo_mode) do + allow(SiteSettings).to receive(:demo_mode_enabled?).and_return(true) + end +end diff --git a/spec/support/multiuser.rb b/spec/support/multiuser.rb deleted file mode 100644 index 94403a904..000000000 --- a/spec/support/multiuser.rb +++ /dev/null @@ -1,6 +0,0 @@ -RSpec.configure do |config| - config.before(:each, :multiuser) do - allow(Flipper).to receive(:enabled?).and_call_original - allow(Flipper).to receive(:enabled?).with(:multiuser).and_return(true) - end -end