+
+ <% if page.landing_page? %>
+ <%= inline_svg_tag("lock.svg", class: "crayons-icon", aria: true, title: "Current locked screen") %>
+ <% end %>
<%= link_to page.title, page.path %>
<%= link_to "Edit", edit_admin_page_path(page.id), class: "ml-auto crayons-btn crayons-btn--s crayons-btn--secondary" %>
diff --git a/cypress/integration/adminFlows/pages/landingPage.spec.js b/cypress/integration/adminFlows/pages/landingPage.spec.js
new file mode 100644
index 000000000..c254e9508
--- /dev/null
+++ b/cypress/integration/adminFlows/pages/landingPage.spec.js
@@ -0,0 +1,139 @@
+describe('Set a landing page from the admin portal', () => {
+ beforeEach(() => {
+ cy.testSetup();
+ cy.fixture('users/adminUser.json').as('user');
+
+ cy.get('@user').then((user) => {
+ cy.loginUser(user).then(() => {
+ cy.visit('/admin/customization/pages');
+ });
+ });
+ });
+
+ it('should set a landing page when no other landing page exists', () => {
+ cy.findAllByRole('link', { name: 'Edit' }).first().click();
+ cy.findByRole('checkbox', { name: "Use as 'Locked Screen'" }).check();
+ cy.findByRole('button', { name: 'Update Page' }).click();
+
+ // Verify that the form has submitted and the page has changed to the confirmation page
+ cy.url().should('contain', '/admin/customization/pages');
+
+ cy.findByRole('img', { name: 'Current locked screen' }).should(
+ 'be.visible',
+ );
+ });
+
+ it('should overwrite the landing page when choosing to set a new landing page', () => {
+ cy.findAllByRole('link', { name: 'Edit' }).first().click();
+ cy.findByRole('checkbox', { name: "Use as 'Locked Screen'" });
+ // Set landing page
+ cy.findByRole('main').within(() => {
+ cy.findByRole('checkbox', { name: "Use as 'Locked Screen'" }).check();
+
+ cy.findByRole('button', { name: 'Update Page' }).click();
+ });
+ cy.url().should('contain', '/admin/customization/pages');
+ // Retrieve the title of the landing page
+ let landingPageTitle;
+ cy.findByRole('main').within(() => {
+ cy.findAllByTestId('page').should((elements) => {
+ for (let i = elements.length - 1; i >= 0; i--) {
+ const el = elements[i];
+ const isLandingPage =
+ el.getElementsByClassName('crayons-icon').length > 0;
+ if (isLandingPage) {
+ landingPageTitle = el.querySelector('a').innerHTML;
+ }
+ }
+ });
+
+ cy.findAllByRole('link', { name: 'Edit' }).eq(1).click();
+ });
+ cy.findByRole('checkbox', { name: "Use as 'Locked Screen'" });
+ // Change landing page
+ cy.findByRole('main').within(() => {
+ cy.findByRole('checkbox', { name: "Use as 'Locked Screen'" }).check();
+
+ cy.findAllByRole('button', {
+ name: 'Overwrite current locked screen',
+ }).click();
+
+ cy.findByRole('button', { name: 'Update Page' }).click();
+ });
+
+ // Check the title of the landing page has changed
+ cy.findByRole('main').within(() => {
+ let newLandingPageTitle;
+ cy.findAllByTestId('page').should((elements) => {
+ for (let i = elements.length - 1; i >= 0; i--) {
+ const el = elements[i];
+ const isLandingPage =
+ el.getElementsByClassName('crayons-icon').length > 0;
+ if (isLandingPage) {
+ newLandingPageTitle = el.querySelector('a').innerHTML;
+ }
+ }
+
+ assert.notEqual(landingPageTitle, newLandingPageTitle);
+ });
+ });
+ });
+
+ it('should not change the landing page when clicking cancel', () => {
+ cy.findAllByRole('link', { name: 'Edit' }).first().click();
+
+ // Set landing page
+ cy.findByRole('main').within(() => {
+ cy.findAllByRole('checkbox', { name: "Use as 'Locked Screen'" })
+ .first()
+ .check();
+
+ cy.findAllByRole('button', { name: 'Update Page' }).first().click();
+ });
+
+ // Retrieve the title of the landing page
+ let landingPageTitle;
+ cy.findByRole('main').within(() => {
+ cy.findAllByTestId('page').should((elements) => {
+ for (let i = elements.length - 1; i >= 0; i--) {
+ const el = elements[i];
+ const isLandingPage =
+ el.getElementsByClassName('crayons-icon').length > 0;
+ if (isLandingPage) {
+ landingPageTitle = el.querySelector('a').innerHTML;
+ }
+ }
+ });
+
+ cy.findAllByRole('link', { name: 'Edit' }).eq(1).click();
+ });
+
+ // Change landing page but then Cancel
+ cy.findByRole('main').within(() => {
+ cy.findAllByRole('checkbox', { name: "Use as 'Locked Screen'" })
+ .first()
+ .check();
+
+ cy.findAllByRole('button', { name: 'Cancel' }).first().click();
+
+ cy.findAllByRole('button', { name: 'Update Page' }).first().click();
+ });
+
+ // Check the title of the landing page has not changed
+ cy.findByRole('main').within(() => {
+ let newLandingPageTitle;
+ cy.findAllByTestId('page').should((elements) => {
+ for (let i = elements.length - 1; i >= 0; i--) {
+ const el = elements[i];
+ const isLandingPage =
+ el.getElementsByClassName('crayons-icon').length > 0;
+ if (isLandingPage) {
+ newLandingPageTitle = el.querySelector('a').innerHTML;
+ }
+ }
+
+ assert.equal(landingPageTitle, newLandingPageTitle);
+ });
+ });
+ });
+});
diff --git a/spec/models/page_spec.rb b/spec/models/page_spec.rb
index 828cdb3c4..b589cd72e 100644
--- a/spec/models/page_spec.rb
+++ b/spec/models/page_spec.rb
@@ -36,6 +36,13 @@ RSpec.describe Page, type: :model do
expect(page).not_to be_valid
expect(page.errors[:slug].to_s.include?("taken")).to be true
end
+
+ it "only allows a single landing_page to be set to true" do
+ create(:page, landing_page: true)
+ page = build(:page, landing_page: true)
+ expect(page).not_to be_valid
+ expect(page.errors[:base].to_s.include?("Only one page")).to be true
+ end
end
context "when callbacks are triggered before save" do
diff --git a/spec/requests/stories_index_spec.rb b/spec/requests/stories_index_spec.rb
index 240070ccb..44be8389a 100644
--- a/spec/requests/stories_index_spec.rb
+++ b/spec/requests/stories_index_spec.rb
@@ -49,6 +49,14 @@ RSpec.describe "StoriesIndex", type: :request do
expect(response.body).to include("Continue with")
end
+ it "renders a landing page if one is active and if the site config is set to private" do
+ allow(Settings::UserExperience).to receive(:public).and_return(false)
+ create(:page, title: "This is a landing page!", landing_page: true)
+
+ get root_path
+ expect(response.body).to include("This is a landing page!")
+ end
+
it "renders all display_ads when published and approved" do
org = create(:organization)
ad = create(:display_ad, published: true, approved: true, organization: org)
diff --git a/spec/support/seeds/seeds_e2e.rb b/spec/support/seeds/seeds_e2e.rb
index de52c53fa..0943f6d51 100644
--- a/spec/support/seeds/seeds_e2e.rb
+++ b/spec/support/seeds/seeds_e2e.rb
@@ -230,3 +230,18 @@ seeder.create_if_none(Badge) do
rewarding_context_message_markdown: Faker::Markdown.random,
)
end
+
+##############################################################################
+
+seeder.create_if_none(Page) do
+ 2.times do
+ Page.create!(
+ slug: Faker::Lorem.word,
+ body_html: "
#{Faker::Hipster.paragraph(sentence_count: 2)}
",
+ title: "#{Faker::Lorem.word} #{rand(100)}",
+ description: "A test page",
+ is_top_level_path: true,
+ landing_page: false,
+ )
+ end
+end
diff --git a/spec/system/admin/admin_creates_new_page_spec.rb b/spec/system/admin/admin_creates_new_page_spec.rb
index 63415c4c5..36892a2ab 100644
--- a/spec/system/admin/admin_creates_new_page_spec.rb
+++ b/spec/system/admin/admin_creates_new_page_spec.rb
@@ -13,6 +13,7 @@ RSpec.describe "Admin creates new page", type: :system do
expect(find_field("page[title]").value).to eq("Code of Conduct")
expect(find_field("page[slug]").value).to eq("code-of-conduct")
expect(find_field("page[is_top_level_path]").value).to eq("1")
+ expect(find_field("page[landing_page]").value).to eq("1")
text = "All participants of #{community_name} are expected to abide by our Code of Conduct"
expect(find_field("page[body_html]").value).to include(text)
diff --git a/spec/system/admin/admin_manages_pages_spec.rb b/spec/system/admin/admin_manages_pages_spec.rb
index 072dcface..636283dfc 100644
--- a/spec/system/admin/admin_manages_pages_spec.rb
+++ b/spec/system/admin/admin_manages_pages_spec.rb
@@ -9,7 +9,8 @@ RSpec.describe "Admin manages pages", type: :system do
body_html: "
hello there
",
title: "Test Page",
description: "A test page",
- is_top_level_path: true)
+ is_top_level_path: true,
+ landing_page: false)
sign_in admin
visit admin_pages_path
end
@@ -111,4 +112,37 @@ RSpec.describe "Admin manages pages", type: :system do
end
end
end
+
+ describe "when there is a landing page" do
+ let(:current_landing_page) { create(:page, landing_page: true) }
+ let(:new_landing_page) { create(:page, landing_page: true) }
+
+ it "allows a landing page to be updated", :aggregate_failures do
+ visit edit_admin_page_path(current_landing_page.id)
+ expect(page).to have_content("Use as 'Locked Screen")
+ uncheck "Use as 'Locked Screen'"
+ click_on("Update Page")
+ expect(page).to have_current_path(admin_pages_path)
+ end
+
+ it "allows an Admin to click through to the current landing page via the modal", :aggregate_failures do
+ visit edit_admin_page_path(new_landing_page.id)
+ expect(page).to have_content("Use as 'Locked Screen")
+ check "Use as 'Locked Screen'"
+ expect(page).to have_link("Current Locked Screen: #{new_landing_page.title}")
+ click_on("Current Locked Screen")
+ expect(page).to have_current_path(new_landing_page.path)
+ expect(page).to have_content(new_landing_page.title)
+ end
+
+ it "allows an Admin to overwrite the current landing page via the checkbox and modal", :aggregate_failures do
+ visit edit_admin_page_path(new_landing_page.id)
+ expect(page).to have_content("Use as 'Locked Screen")
+ check "Use as 'Locked Screen'"
+ expect(page).to have_link("Current Locked Screen: #{new_landing_page.title}")
+ click_on("Overwrite current locked screen")
+ click_on("Update Page")
+ expect(page).to have_current_path(admin_pages_path)
+ end
+ end
end