From 6926bc8c59426193239b6ef38e8e4ffd9453d6cd Mon Sep 17 00:00:00 2001
From: smriti <sgarg@msystechnologies.com>
Date: Thu, 8 Jul 2021 20:14:38 +0530
Subject: [PATCH] Added new url helper for progress.com and updated footer
 links

Signed-off-by: smriti <sgarg@msystechnologies.com>
---
 src/supermarket/app/helpers/custom_url_helper.rb       | 9 +++++++++
 src/supermarket/app/views/layouts/application.html.erb | 6 +++---
 src/supermarket/spec/helpers/custom_url_helper_spec.rb | 5 +++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/supermarket/app/helpers/custom_url_helper.rb b/src/supermarket/app/helpers/custom_url_helper.rb
index c557efb7a..1d04cc9d3 100644
--- a/src/supermarket/app/helpers/custom_url_helper.rb
+++ b/src/supermarket/app/helpers/custom_url_helper.rb
@@ -9,6 +9,10 @@ def chef_domain
     ENV["CHEF_DOMAIN"] || "chef.io"
   end
 
+  def progress_domain
+    ENV["PROGRESS_DOMAIN"] || "progress.com"
+  end
+
   def chef_server_url
     ENV["CHEF_SERVER_URL"] || "https://api.chef.io"
   end
@@ -18,6 +22,11 @@ def chef_www_url(extra = nil)
     extra_dispatch(url, extra)
   end
 
+  def progress_www_url(extra = nil)
+    url = ENV["CHEF_WWW_URL"] || "https://www.#{progress_domain}"
+    extra_dispatch(url, extra)
+  end
+
   def chef_blog_url(extra = nil)
     url = ENV["CHEF_BLOG_URL"] || "#{chef_www_url}/blog"
     extra_dispatch(url, extra)
diff --git a/src/supermarket/app/views/layouts/application.html.erb b/src/supermarket/app/views/layouts/application.html.erb
index 6654348be..41fe8276e 100644
--- a/src/supermarket/app/views/layouts/application.html.erb
+++ b/src/supermarket/app/views/layouts/application.html.erb
@@ -69,9 +69,9 @@
         <footer class="footer">
           &copy; 2008&thinsp;&ndash;&thinsp;<%= Time.new.year %> Chef Software, Inc. All Rights Reserved.
           <br><br><%= link_to 'Code of Conduct', chef_docs_url('community_guidelines.html') %>
-          <%= link_to 'Terms and Conditions of Use', chef_www_url('terms-of-service') %>
-          <%= link_to 'Privacy Policy', chef_www_url('privacy-policy') %>
-          <%= link_to 'Trademark Policy', chef_www_url('trademark-policy') %>
+          <%= link_to 'Terms and Conditions of Use', progress_www_url('legal/terms-of-use') %>
+          <%= link_to 'Privacy Policy', progress_www_url('legal/privacy-policy') %>
+          <%= link_to 'Trademark Policy', progress_www_url('legal/trademarks') %>
           <%= link_to 'Status', chef_status_url %>
         </footer>
 
diff --git a/src/supermarket/spec/helpers/custom_url_helper_spec.rb b/src/supermarket/spec/helpers/custom_url_helper_spec.rb
index 139c16054..f622c2939 100644
--- a/src/supermarket/spec/helpers/custom_url_helper_spec.rb
+++ b/src/supermarket/spec/helpers/custom_url_helper_spec.rb
@@ -14,6 +14,11 @@
     expect(helper.chef_domain).to eql("chef.io")
   end
 
+  it "should have a default progress domain" do
+    expect(ENV["PROGRESS_DOMAIN"]).to be_nil
+    expect(helper.progress_domain).to eql("progress.com")
+  end
+
   it "should have a server url" do
     expect(ENV["CHEF_SERVER_URL"]).to be_nil
     expect(helper.chef_server_url).to eql("https://api.chef.io")