ama_layout 10.0.1 → 11.3.0

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -136,14 +136,15 @@ describe AmaLayout::NavigationDecorator do
     end
   end
 
-  describe '#manage_credit_card_link' do
+  describe '#member_links' do
     let(:navigation) { FactoryBot.build(:navigation, user: user) }
+    let(:member_links) { navigation_presenter.member_links }
 
     context 'nil user' do
       let(:user) {}
 
       it 'returns nothing' do
-        expect(navigation_presenter.manage_credit_card_link).to eq('')
+        expect(member_links).to eq('')
       end
     end
 
@@ -151,7 +152,7 @@ describe AmaLayout::NavigationDecorator do
       let(:user) { FactoryBot.build(:user, :non_member) }
 
       it 'returns nothing' do
-        expect(navigation_presenter.manage_credit_card_link).to eq('')
+        expect(member_links).to eq('')
       end
     end
 
@@ -159,7 +160,7 @@ describe AmaLayout::NavigationDecorator do
       let(:user) { FactoryBot.build(:user, :in_renewal_late) }
 
       it 'returns nothing' do
-        expect(navigation_presenter.manage_credit_card_link).to eq('')
+        expect(member_links).to eq('')
       end
     end
 
@@ -167,7 +168,7 @@ describe AmaLayout::NavigationDecorator do
       let(:user) { FactoryBot.build(:user, :outstanding_balance) }
 
       it 'returns the manage credit cards link' do
-        expect(navigation_presenter.manage_credit_card_link).to include('Manage Credit Cards')
+        expect(member_links).to include('Manage Credit Cards')
       end
     end
 
@@ -175,7 +176,7 @@ describe AmaLayout::NavigationDecorator do
       let(:user) { FactoryBot.build(:user) }
 
       it 'returns the manage credit cards link' do
-        expect(navigation_presenter.manage_credit_card_link).to include('Manage Credit Cards')
+        expect(member_links).to include('Manage Credit Cards')
       end
     end
 
@@ -183,7 +184,7 @@ describe AmaLayout::NavigationDecorator do
       let(:user) { FactoryBot.build(:user, :in_renewal) }
 
       it 'returns the manage credit cards link' do
-        expect(navigation_presenter.manage_credit_card_link).to include('Manage Credit Cards')
+        expect(member_links).to include('Manage Credit Cards')
       end
     end
   end

data/spec/ama_layout/moneris_spec.rb

@@ -1,8 +1,27 @@
+# frozen_string_literal: true
+
 describe AmaLayout::Moneris do
+  describe '#textbox_style_file' do
+    around(:each) do |example|
+      current_version = Rails.configuration.stylesheet_resolver.version
+      Rails.configuration.stylesheet_resolver.version = version
+      example.run
+      Rails.configuration.stylesheet_resolver.version = current_version
+    end
+    context 'v2' do
+      let(:version) { 'v2' }
+
+      it 'returns the correct file path' do
+        expect(subject.textbox_style_file).to include("lib/ama_layout/moneris/#{version}/textbox.txt")
+      end
+    end
+
+    context 'v3' do
+      let(:version) { 'v3' }
 
-  describe "#textbox_style_file" do
-    it "return file path" do
-      expect(subject.textbox_style_file).to include "lib/ama_layout/moneris/textbox.txt"
+      it 'returns the correct file path' do
+        expect(subject.textbox_style_file).to include("lib/ama_layout/moneris/#{version}/textbox.txt")
+      end
     end
   end
 end

data/spec/helpers/ama_layout_content_helper_spec.rb

@@ -1,159 +1,161 @@
+# frozen_string_literal: true
+
 describe AmaLayoutContentHelper do
-  let(:greeting) { "DJ Funky Fresh" }
-  let(:site_name) { "Waffle Emporium" }
-  let(:site_domain) { "http://waffleemporium.ca" }
+  let(:greeting) { 'DJ Funky Fresh' }
+  let(:site_name) { 'Waffle Emporium' }
+  let(:site_domain) { 'http://waffleemporium.ca' }
   let(:site_url) { "#{site_domain}/wafflesauce" }
   let(:nav_item) { FactoryBot.build(:navigation_item) }
 
-  describe "#greeting" do
-    it "returns the greeting set in the domain cookie" do
+  describe '#greeting' do
+    it 'returns the greeting set in the domain cookie' do
       helper.request.cookies[:logged_in_meta] = greeting
       expect(helper.greeting).to eq greeting
     end
   end
 
-  describe "#utm_source" do
-    it "returns the downcased character-only representation of the site name" do
+  describe '#utm_source' do
+    it 'returns the downcased character-only representation of the site name' do
       allow(Rails.configuration).to receive(:site_name).and_return(site_name)
-      expect(helper.utm_source).to eq site_name.downcase.gsub(/\W/, "")
+      expect(helper.utm_source).to eq site_name.downcase.gsub(/\W/, '')
     end
   end
 
-  describe "#active_section" do
-    it "returns active if request include the path" do
+  describe '#active_section' do
+    it 'returns active if request include the path' do
       allow_any_instance_of(ActionController::TestRequest).to receive(:fullpath).and_return("#{site_domain}/gotica")
-      expect(helper.active_section(nav_item)).to eq "activepage"
+      expect(helper.active_section(nav_item)).to eq 'activepage'
     end
 
-    it "returns nil if request  does not include the path" do
+    it 'returns nil if request  does not include the path' do
       expect(helper.active_section(nav_item)).to eq nil
     end
   end
 
-  describe "#active_page" do
+  describe '#active_page' do
     before(:each) do
       allow(helper.request).to receive(:fullpath).and_return(site_url)
     end
 
-    it "returns active if the given path matches the request path" do
-      expect(helper.active_page(site_url)).to eq "activepage"
+    it 'returns active if the given path matches the request path' do
+      expect(helper.active_page(site_url)).to eq 'activepage'
     end
 
-    it "returns nothing if the given patch does not match the request path" do
-      expect(helper.active_page("http://waffleemporium.ca/ecuaselffaw")).to be_nil
+    it 'returns nothing if the given patch does not match the request path' do
+      expect(helper.active_page('http://waffleemporium.ca/ecuaselffaw')).to be_nil
     end
   end
 
-  describe "#active_domain" do
+  describe '#active_domain' do
     before(:each) do
       allow(helper.request).to receive(:url).and_return(site_url)
     end
 
-    it "returns active if the request domain matches the given domain" do
-      expect(helper.active_domain(site_domain)).to eq "active"
+    it 'returns active if the request domain matches the given domain' do
+      expect(helper.active_domain(site_domain)).to eq 'active'
     end
 
-    it "returns nothing if the request domain does not match the given domain" do
-      expect(helper.active_domain("http://pancakeemporium.ca")).to be_nil
+    it 'returns nothing if the request domain does not match the given domain' do
+      expect(helper.active_domain('http://pancakeemporium.ca')).to be_nil
     end
   end
 
-  describe "#renew_or_join_path" do
-    it "returns nothing if the visitor is logged in" do
-      expect(helper.renew_or_join_path(true)).to eq ""
+  describe '#renew_or_join_path' do
+    it 'returns nothing if the visitor is logged in' do
+      expect(helper.renew_or_join_path(true)).to eq ''
     end
 
-    it "returns the join link if the visitor is not logged in" do
-      expect(helper.renew_or_join_path(false)).to include "Become a Member"
+    it 'returns the join link if the visitor is not logged in' do
+      expect(helper.renew_or_join_path(false)).to include 'Become a Member'
     end
   end
 
-  describe "#gift_or_pricing_path" do
-    it "returns nothing if the visitor is logged in" do
-      expect(helper.gift_or_pricing_path(true)).to eq ""
+  describe '#gift_or_pricing_path' do
+    it 'returns nothing if the visitor is logged in' do
+      expect(helper.gift_or_pricing_path(true)).to eq ''
     end
 
-    it "returns the gift link if the visitor is not logged in" do
-      expect(helper.gift_or_pricing_path(false)).to include "Gift Membership"
+    it 'returns the gift link if the visitor is not logged in' do
+      expect(helper.gift_or_pricing_path(false)).to include 'Gift Membership'
     end
   end
 
-  describe "#dropdown_menu" do
+  describe '#dropdown_menu' do
     let(:render_args) do
-      { partial: "ama_layout/dropdown_menu", locals: { logged_in: true, greeting: greeting } }
+      { partial: 'ama_layout/v3/dropdown_menu', locals: { logged_in: true, greeting: greeting } }
     end
 
-    it "renders the dropdown menu if the visitor is logged in" do
+    it 'renders the dropdown menu if the visitor is logged in' do
       expect(helper).to receive(:render).with(render_args)
       helper.dropdown_menu(true, greeting)
     end
 
-    it "does not render the dropdown menu if the visitor is not logged in" do
-      expect(helper.dropdown_menu(false, greeting)).to eq ""
+    it 'does not render the dropdown menu if the visitor is not logged in' do
+      expect(helper.dropdown_menu(false, greeting)).to eq ''
     end
   end
 
-  describe "#tablet_menu" do
+  describe '#tablet_menu' do
     let(:render_args) do
-      { partial: "ama_layout/tablet_menu", locals: { logged_in: true, greeting: greeting } }
+      { partial: 'ama_layout/v3/tablet_menu', locals: { logged_in: true, greeting: greeting } }
     end
 
-    it "renders the tablet menu if the visitor is logged in" do
+    it 'renders the tablet menu if the visitor is logged in' do
       expect(helper).to receive(:render).with(render_args)
       helper.tablet_menu(true, greeting)
     end
 
-    it "does not render the tablet menu if the visitor is not logged in" do
-      expect(helper.tablet_menu(false, greeting)).to eq ""
+    it 'does not render the tablet menu if the visitor is not logged in' do
+      expect(helper.tablet_menu(false, greeting)).to eq ''
     end
   end
 
-  describe "#tablet_signout" do
-    it "renders a signout link if the visitor is logged in" do
-      expect(helper).to receive(:render).with("ama_layout/tablet_signout")
+  describe '#tablet_signout' do
+    it 'renders a signout link if the visitor is logged in' do
+      expect(helper).to receive(:render).with('ama_layout/v3/tablet_signout')
       helper.tablet_signout(true)
     end
 
-    it "does not render the tablet menu if the visitor is not logged in" do
-      expect(helper.tablet_signout(false)).to eq ""
+    it 'does not render the tablet menu if the visitor is not logged in' do
+      expect(helper.tablet_signout(false)).to eq ''
     end
   end
 
-  describe "#notice" do
-    let(:message) { "This is a notice." }
+  describe '#notice' do
+    let(:message) { 'This is a notice.' }
 
-    it "renders the notice partial if a notice is present" do
-      expect(helper).to receive(:render).with partial: "ama_layout/notice", locals: { message: message }
+    it 'renders the notice partial if a notice is present' do
+      expect(helper).to receive(:render).with partial: 'ama_layout/v3/notice', locals: { message: message }
       helper.notice(message)
     end
 
-    it "does not render the notice partial if a notice is not present" do
+    it 'does not render the notice partial if a notice is not present' do
       expect(helper.notice(nil)).to be_nil
     end
   end
 
-  describe "#alert" do
-    let(:message) { "This is an alert." }
+  describe '#alert' do
+    let(:message) { 'This is an alert.' }
 
-    it "renders the alert partial if a alert is present" do
-      expect(helper).to receive(:render).with partial: "ama_layout/alert", locals: { message: message }
+    it 'renders the alert partial if a alert is present' do
+      expect(helper).to receive(:render).with partial: 'ama_layout/v3/alert', locals: { message: message }
       helper.alert(message)
     end
 
-    it "does not render the alert partial if a alert is not present" do
+    it 'does not render the alert partial if a alert is not present' do
       expect(helper.notice(nil)).to be_nil
     end
   end
 
-  describe "#success_message" do
-    let(:message) { "This is a success message" }
+  describe '#success_message' do
+    let(:message) { 'This is a success message' }
 
-    it "renders the success partial if a success message is present" do
-      expect(helper).to receive(:render).with partial: "ama_layout/success", locals: { message: message }
+    it 'renders the success partial if a success message is present' do
+      expect(helper).to receive(:render).with partial: 'ama_layout/v3/success', locals: { message: message }
       helper.success_message(message)
     end
 
-    it "does not render the success partial if the success message is not present" do
+    it 'does not render the success partial if the success message is not present' do
       expect(helper.success_message(nil)).to be_nil
     end
   end

data/spec/spec_helper.rb

@@ -8,7 +8,9 @@ require 'timecop'
 
 ENV['RAILS_ENV'] = 'test'
 
-Combustion.initialize! :all
+Combustion.initialize!(:all) do
+  config.stylesheet_resolver = OpenStruct.new(version: 'v3')
+end
 
 Dir['./spec/support/**/*.rb'].sort.each { |file| require file }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 10.0.1
+  version: 11.3.0
 platform: ruby
 authors:
 - Darko Dosenovic
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: breadcrumbs_on_rails
@@ -89,16 +89,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.17.3
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
@@ -223,11 +223,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
 - ".simplecov"
-- ".travis.yml"
+- Dangerfile
 - Gemfile
 - LICENSE.txt
 - PULL_REQUEST_TEMPLATE.md
@@ -256,35 +257,65 @@ files:
 - app/controllers/ama_layout/api/v1/notifications_controller.rb
 - app/helpers/ama_layout_breadcrumb_helper.rb
 - app/helpers/ama_layout_content_helper.rb
+- app/helpers/ama_layout_partial_helper.rb
 - app/helpers/ama_layout_path_helper.rb
-- app/views/ama_layout/_alert.html.erb
-- app/views/ama_layout/_applogo.html.erb
-- app/views/ama_layout/_breadcrumbs.html.erb
-- app/views/ama_layout/_custom_nav_links.html.erb
-- app/views/ama_layout/_custom_sidebar.html.erb
-- app/views/ama_layout/_footer.html.erb
-- app/views/ama_layout/_main_nav_item.html.erb
-- app/views/ama_layout/_main_top_nav_item.html.erb
-- app/views/ama_layout/_manage_credit_card_link.html.erb
-- app/views/ama_layout/_mobile_links.html.erb
-- app/views/ama_layout/_mobile_notification_icon.html.erb
-- app/views/ama_layout/_notice.html.erb
-- app/views/ama_layout/_notices.html.erb
-- app/views/ama_layout/_notification.html.erb
-- app/views/ama_layout/_notification_icon.html.erb
-- app/views/ama_layout/_notification_sidebar.html.erb
-- app/views/ama_layout/_sidebar.html.erb
-- app/views/ama_layout/_sign_out_link.html.erb
-- app/views/ama_layout/_siteheader.html.erb
-- app/views/ama_layout/_sub_nav.html.erb
-- app/views/ama_layout/_sub_nav_item.html.erb
-- app/views/ama_layout/_success.html.erb
-- app/views/ama_layout/_top_nav.html.erb
-- app/views/ama_layout/_top_sub_nav.html.erb
-- app/views/ama_layout/_top_sub_nav_item.html.erb
 - app/views/ama_layout/agent/_sidebar.html.erb
 - app/views/ama_layout/agent/_siteheader.html.erb
 - app/views/ama_layout/agent/_top_nav.html.erb
+- app/views/ama_layout/v2/_alert.html.erb
+- app/views/ama_layout/v2/_applogo.html.erb
+- app/views/ama_layout/v2/_breadcrumbs.html.erb
+- app/views/ama_layout/v2/_custom_nav_links.html.erb
+- app/views/ama_layout/v2/_custom_sidebar.html.erb
+- app/views/ama_layout/v2/_font.html.erb
+- app/views/ama_layout/v2/_font_awesome_pro_kit.html.erb
+- app/views/ama_layout/v2/_footer.html.erb
+- app/views/ama_layout/v2/_main_nav_item.html.erb
+- app/views/ama_layout/v2/_main_top_nav_item.html.erb
+- app/views/ama_layout/v2/_member_links.html.erb
+- app/views/ama_layout/v2/_mobile_links.html.erb
+- app/views/ama_layout/v2/_mobile_notification_icon.html.erb
+- app/views/ama_layout/v2/_notice.html.erb
+- app/views/ama_layout/v2/_notices.html.erb
+- app/views/ama_layout/v2/_notification.html.erb
+- app/views/ama_layout/v2/_notification_icon.html.erb
+- app/views/ama_layout/v2/_notification_sidebar.html.erb
+- app/views/ama_layout/v2/_sidebar.html.erb
+- app/views/ama_layout/v2/_sign_out_link.html.erb
+- app/views/ama_layout/v2/_siteheader.html.erb
+- app/views/ama_layout/v2/_sub_nav.html.erb
+- app/views/ama_layout/v2/_sub_nav_item.html.erb
+- app/views/ama_layout/v2/_success.html.erb
+- app/views/ama_layout/v2/_top_nav.html.erb
+- app/views/ama_layout/v2/_top_sub_nav.html.erb
+- app/views/ama_layout/v2/_top_sub_nav_item.html.erb
+- app/views/ama_layout/v3/_alert.html.erb
+- app/views/ama_layout/v3/_applogo.html.erb
+- app/views/ama_layout/v3/_breadcrumbs.html.erb
+- app/views/ama_layout/v3/_custom_nav_links.html.erb
+- app/views/ama_layout/v3/_custom_sidebar.html.erb
+- app/views/ama_layout/v3/_font.html.erb
+- app/views/ama_layout/v3/_font_awesome_pro_kit.html.erb
+- app/views/ama_layout/v3/_footer.html.erb
+- app/views/ama_layout/v3/_main_nav_item.html.erb
+- app/views/ama_layout/v3/_main_top_nav_item.html.erb
+- app/views/ama_layout/v3/_member_links.html.erb
+- app/views/ama_layout/v3/_mobile_links.html.erb
+- app/views/ama_layout/v3/_mobile_notification_icon.html.erb
+- app/views/ama_layout/v3/_notice.html.erb
+- app/views/ama_layout/v3/_notices.html.erb
+- app/views/ama_layout/v3/_notification.html.erb
+- app/views/ama_layout/v3/_notification_icon.html.erb
+- app/views/ama_layout/v3/_notification_sidebar.html.erb
+- app/views/ama_layout/v3/_sidebar.html.erb
+- app/views/ama_layout/v3/_sign_out_link.html.erb
+- app/views/ama_layout/v3/_siteheader.html.erb
+- app/views/ama_layout/v3/_sub_nav.html.erb
+- app/views/ama_layout/v3/_sub_nav_item.html.erb
+- app/views/ama_layout/v3/_success.html.erb
+- app/views/ama_layout/v3/_top_nav.html.erb
+- app/views/ama_layout/v3/_top_sub_nav.html.erb
+- app/views/ama_layout/v3/_top_sub_nav_item.html.erb
 - app/views/application/_account_toggle.html.erb
 - config.ru
 - config/routes.rb
@@ -301,7 +332,8 @@ files:
 - lib/ama_layout/decorators/notification_decorator.rb
 - lib/ama_layout/draper_replacement.rb
 - lib/ama_layout/moneris.rb
-- lib/ama_layout/moneris/textbox.txt
+- lib/ama_layout/moneris/v2/textbox.txt
+- lib/ama_layout/moneris/v3/textbox.txt
 - lib/ama_layout/navigation.rb
 - lib/ama_layout/navigation.yml
 - lib/ama_layout/navigation_helper.rb