@@ -44,12 +45,12 @@
style="display: none;"
>
- <% if @dropdown_practices.present? && @dropdown_categories.present? && @dropdown_communities.present? %>
+ <% if @dropdown_practices.present? && @dropdown_categories.present? && @dropdown_communities.present? && @dropdown_products.present? %>
-
+
-
<% end %>
+
+
+ <%= image_tag("homepage/section-ipm.png", alt: "a doctor and medical staff speaking in a busy hallway", class: "margin-bottom-3 grid-col-12 tablet:grid-col-6 desktop:grid-col-6") %>
+
+
Intrapreneurial Products
+
+ The VA Intrapreneurial Product Marketplace highlights frontline VA employee innovators and their products available for purchase to put back in the hands of who they were designed with and for, Veterans.
+
+ <%= link_to 'Learn More', '/intrapreneurial-product-marketplace', class: 'usa-link', 'aria-describedby': 'ipm-section-title', data: { turbolinks: false } %>
+
+
Trending Tags
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb
index e6cbac342..e3162479a 100644
--- a/app/views/products/show.html.erb
+++ b/app/views/products/show.html.erb
@@ -86,16 +86,25 @@
<% end %>
-
- <%= 'Innovator'.pluralize(@product.va_employee_practices.count) %>
- <% @product.va_employee_practices.each do |innovator| %>
-
-
<%= innovator.va_employee&.name %>
-
<%= innovator.va_employee&.role %>
-
<%= 'Innovator'.pluralize(innovators.count) %>
+ <% innovators.each do |innovator| %>
+
+
<%= innovator&.name %>
+
<%= innovator&.role %>
+
From the Innovator
+ <%= simple_format(@product.origin_story, wrapper_tag: "p") %>
+ <% end %>
<% end %>
- From the Innovator
- <%= simple_format(@product.origin_story, wrapper_tag: "p") %>
<% if @product.practice_multimedia.any? %>
diff --git a/app/views/shared/_header.html.erb b/app/views/shared/_header.html.erb
index 98da539ac..a3a79ce60 100644
--- a/app/views/shared/_header.html.erb
+++ b/app/views/shared/_header.html.erb
@@ -90,6 +90,11 @@
<% end %>
+
+
+ Products
+
+
<%= render partial: 'shared/header_user_login_nav', locals: { accordion_id: 'dm-user-mobile-profile-options' } %>
diff --git a/spec/features/homepage_spec.rb b/spec/features/homepage_spec.rb
index 72a440d66..1c5329a7a 100644
--- a/spec/features/homepage_spec.rb
+++ b/spec/features/homepage_spec.rb
@@ -15,6 +15,11 @@
@practice_2 = create(:practice, name: 'The Second Best Practice Ever!', initiating_facility_type: 'facility', tagline: 'Test tagline', date_initiated: 'Sun, 06 Feb 1992 00:00:00 UTC +00:00', created_at: 'Sun, 06 Feb 1992 00:00:00 UTC +00:00', summary: 'This is the best practice ever.', overview_problem: 'overview-problem', is_public: true, published: true, approved: true, user: @user)
@practice_3 = create(:practice, name: 'The Third Best Practice Ever!', initiating_facility_type: 'facility', tagline: 'Test tagline', date_initiated: 'Sun, 07 Feb 1992 00:00:00 UTC +00:00', created_at: 'Sun, 07 Feb 1992 00:00:00 UTC +00:00', summary: 'This is the best practice ever.', overview_problem: 'overview-problem', is_public: true, published: true, approved: true, user: @user)
@va_only_practice = create(:practice, name: 'Recent VA-only practice!', initiating_facility_type: 'facility', tagline: 'Test tagline', date_initiated: 'Sun, 08 Feb 1992 00:00:00 UTC +00:00', created_at: 'Sun, 07 Feb 1992 00:00:00 UTC +00:00', summary: 'This is the best practice ever.', overview_problem: 'overview-problem', is_public: false, published: true, approved: true, user: @user)
+ @product_1 = create(:product, published: true)
+ @product_2 = create(:product , published: true)
+ @product_3 = create(:product, published: true)
+ @ipm = create(:page_group, name: "Intrapreneurial Product Marketplace")
+ @ipm_homepage = create(:page, page_group: @ipm, slug: "home", title: "Intrapreneurial Product Marketplace" )
create(:practice_origin_facility, practice: @practice, facility_type: 0, va_facility_id: 1)
@@ -37,8 +42,20 @@
visit '/'
end
- it 'links to the Shark Tank page' do
- expect(page).to have_link(href: '/competitions/shark-tank')
+ describe 'static content sections' do
+ it 'invites users to submit innovations' do
+ within('#main-content') do
+ expect(page).to have_content('Submit Innovations')
+ expect(page).to have_link('Nominate', href: nominate_an_innovation_path)
+ end
+ end
+
+ it 'features Intrapreneurial Products' do
+ within('#main-content') do
+ expect(page).to have_content('Intrapreneurial Products')
+ expect(page).to have_link('Learn More', href: '/intrapreneurial-product-marketplace')
+ end
+ end
end
describe 'search section' do
@@ -54,13 +71,6 @@
end
end
- it 'invites users to submit innovations' do
- within('#main-content') do
- expect(page).to have_content('Submit Innovations')
- expect(page).to have_link('Nominate', href: nominate_an_innovation_path)
- end
- end
-
it 'allows the user to subscribe to the DM newsletter by taking them to the GovDelivery site' do
fill_in('Your email address', with: 'vladilena.milize@test.com')
@@ -88,7 +98,6 @@
it 'lists most recently created innovations' do
within '#practice-list' do
- expect(page).to have_content('The Best Practice Ever!')
expect(page).to have_content('The Second Best Practice Ever!')
expect(page).to have_content('The Third Best Practice Ever!')
@@ -103,14 +112,13 @@
find('#dm-homepage-search-field').click
expect(page).to have_content('Recent VA-only practice!')
- expect(page).to have_content('The Second Best Practice Ever!')
expect(page).to have_content('The Third Best Practice Ever!')
end
it 'lists popular categories' do
within '#category-list' do
expect(page).to have_content('COVID')
- expect(page).to have_content('Telehealth')
+ expect(page).to have_content('Nutrition & Food')
end
end
@@ -150,10 +158,22 @@
expect(page).to have_content("1 Result:")
expect(page).to have_content(@practice_3.name)
end
+
+ it 'temporarily links to IPM pagebuilder page' do
+ within '#search-dropdown' do
+ expect(page).to have_link('Browse all Products', href: '/intrapreneurial-product-marketplace')
+ end
+ end
+
+ it 'lists most recently created products' do
+ expect(page).to have_content(@product_3.name)
+ expect(page).to have_content(@product_2.name)
+ expect(page).not_to have_content(@product_1.name)
+ end
end
it 'lets a user navigate results with arrow keys' do
- page.send_keys :down, :down, :down, :down, :down # navigate to first category
+ 7.times { page.send_keys :down} # navigate to first category
page.send_keys :enter # select category
expect(page).to have_current_path('/search?category=COVID')
expect(page).to have_content("2 Results: TAG: COVID")
@@ -166,10 +186,10 @@
end
it 'tracks clicks on practice links' do
- event = wait_for_ahoy_js('The Best Practice Ever!')
+ event = wait_for_ahoy_js(@practice_2.name)
expect(event.name).to eq("Dropdown Practice Link Clicked")
- expect(event.properties["practice_name"]).to eq("The Best Practice Ever!")
+ expect(event.properties["practice_name"]).to eq(@practice_2.name)
expect(event.properties["from_homepage"]).to be_truthy
end
@@ -209,6 +229,21 @@
expect(event.name).to eq("Dropdown Browse-all Link Clicked")
expect(event.properties["type"]).to eq("community")
end
+
+ it 'tracks clicks on product links' do
+ event = wait_for_ahoy_js(@product_2.name)
+
+ expect(event.name).to eq("Dropdown Product Link Clicked")
+ expect(event.properties["product_name"]).to eq(@product_2.name)
+ expect(event.properties["from_homepage"]).to be_truthy
+ end
+
+ it 'tracks clicks on "Browse All Products Link' do
+ event = wait_for_ahoy_js('Browse all Products')
+
+ expect(event.name).to eq("Dropdown Browse-all Link Clicked")
+ expect(event.properties["type"]).to eq("product")
+ end
end
def wait_for_ahoy_js(link_text)
diff --git a/spec/features/product_viewer_spec.rb b/spec/features/product_viewer_spec.rb
index efccb6861..8d58df463 100644
--- a/spec/features/product_viewer_spec.rb
+++ b/spec/features/product_viewer_spec.rb
@@ -8,6 +8,7 @@
let(:product_with_images) { create(:product, :with_image, :with_multimedia, name: 'Product with Images', published: true) }
let(:product_with_tags) { create(:product, :with_tags, published: true) }
let(:product_with_editors) { create(:product, :with_editors, user: product_owner)}
+ let(:product_with_innovators) { create(:product, :with_va_employees, published: true) }
it 'hides unpublished pages' do
visit product_path(product)
@@ -41,6 +42,23 @@
expect(page).to have_no_selector('h3', text: 'Vendor')
end
+ it 'conditionally hides the Intrapreneur section' do
+ visit product_path(:product_with_innovators)
+ within('#practice-show-intrapreneur') do
+ expect(page).to have_css('.sidenav-header', text: 'Intrapreneur')
+ expect(page).to have_content('Innovator')
+ expect(page).to have_content('From the Innovator')
+ end
+
+ product.update(origin_story: nil, published: true)
+ visit product_path(product)
+ within('#practice-show-intrapreneur') do
+ expect(page).not_to have_css('.sidenav-header', text: 'Intrapreneur')
+ expect(page).not_to have_content('Innovator')
+ expect(page).not_to have_content('From the Innovator')
+ end
+ end
+
it 'conditionally renders linked fields ' do
login_as(admin, :scope => :user, :run_callbacks => false)
visit product_path(product)
diff --git a/spec/features/shared/header_spec.rb b/spec/features/shared/header_spec.rb
index 4123f19c0..8a800d3a3 100644
--- a/spec/features/shared/header_spec.rb
+++ b/spec/features/shared/header_spec.rb
@@ -44,6 +44,7 @@
expect(page).to have_link(href: '/competitions/shark-tank')
expect(page).to have_content('Browse by locations')
expect(page).to have_content('Communities')
+ expect(page).to have_content('Products')
expect(page).to have_content('Your profile')
end
end
@@ -73,6 +74,7 @@
expect(page).to have_link(href: '/competitions/shark-tank')
expect(page).to have_content('Browse by locations')
expect(page).to have_content('Communities')
+ expect(page).to have_content('Products')
expect(page).to_not have_content('Sign in')
end