ama_layout 9.5.2 → 11.1.0

data/lib/ama_layout/navigation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmaLayout
   class Navigation
     include ActiveModel::Model
@@ -14,44 +16,49 @@ module AmaLayout
     end
 
     cattr_accessor :member do
-      "member"
+      'member'
     end
 
     cattr_accessor :non_member do
-      "non-member"
+      'non-member'
     end
 
     cattr_accessor :member_in_renewal do
-      "member-in-renewal"
+      'member-in-renewal'
     end
 
     cattr_accessor :member_in_renewal_late do
-      "member-in-renewal-late"
+      'member-in-renewal-late'
     end
 
     cattr_accessor :member_with_outstanding_balance do
-      "member-with-outstanding-balance"
+      'member-with-outstanding-balance'
     end
 
     def items
       navigation_items.fetch(user.try(:navigation), []).map do |n|
-        NavigationItem.new n.merge({ current_url: current_url})
+        NavigationItem.new n.merge(current_url: current_url)
       end
     end
 
     def navigation_items
-      YAML.load ERB.new(File.read nav_file_path).result
+      YAML.safe_load(ERB.new(File.read(nav_file_path)).result)
     end
 
     def email
       user.email
     end
 
-  private
+    private
 
     def defaults
       {
-        nav_file_path: File.join(Gem.loaded_specs["ama_layout"].full_gem_path, "lib", "ama_layout", "navigation.yml")
+        nav_file_path: File.join(
+          Gem.loaded_specs['ama_layout'].full_gem_path,
+          'lib',
+          'ama_layout',
+          'navigation.yml'
+        )
       }
     end
   end

data/lib/ama_layout/navigation.yml

@@ -51,7 +51,7 @@ member:
   - text: "My Travel"
     link: "<%= Rails.configuration.travel_login_url %>"
   - text: "My Account Settings"
-    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    link: "<%= Rails.configuration.gatekeeper_site %>/account_settings"
     icon: "fa-cogs"
     sub_nav:
       - text: "Change Email/Password"
@@ -136,7 +136,7 @@ member-in-renewal:
   - text: "My Travel"
     link: "<%= Rails.configuration.travel_login_url %>"
   - text: "My Account Settings"
-    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    link: "<%= Rails.configuration.gatekeeper_site %>/account_settings"
     icon: "fa-cogs"
     sub_nav:
       - text: "Change Email/Password"

data/lib/ama_layout/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmaLayout
-  VERSION = '9.5.2'
+  VERSION = '11.1.0'
 end

data/spec/ama_layout/decorators/moneris_decorator_spec.rb

@@ -14,7 +14,7 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "-webkit-user-select: text;"
       expect(moneris_presenter.textbox).to include "-webkit-writing-mode: horizontal-tb;"
       expect(moneris_presenter.textbox).to include "background-color: rgb(255, 255, 255);"
-      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-bottom-color: rgb(160, 160, 161);"
       expect(moneris_presenter.textbox).to include "border-bottom-style: solid;"
       expect(moneris_presenter.textbox).to include "border-bottom-width: 2px;"
       expect(moneris_presenter.textbox).to include "border-image-outset: 0px;"
@@ -22,13 +22,13 @@ describe AmaLayout::MonerisDecorator, type: :decorator do
       expect(moneris_presenter.textbox).to include "border-image-slice: 100%;"
       expect(moneris_presenter.textbox).to include "border-image-source: none;"
       expect(moneris_presenter.textbox).to include "border-image-width: 1;"
-      expect(moneris_presenter.textbox).to include "border-left-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-left-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-left-style: solid;"
       expect(moneris_presenter.textbox).to include "border-left-width: 2px;"
-      expect(moneris_presenter.textbox).to include "border-right-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-right-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-right-style: solid;"
       expect(moneris_presenter.textbox).to include "border-right-width: 2px;"
-      expect(moneris_presenter.textbox).to include "border-top-color: rgb(229, 229, 229);"
+      expect(moneris_presenter.textbox).to include "border-top-color: rgb(160, 160, 161)"
       expect(moneris_presenter.textbox).to include "border-top-style: solid;"
       expect(moneris_presenter.textbox).to include "border-top-width: 2px;"
       expect(moneris_presenter.textbox).to include "box-shadow: none;"

data/spec/ama_layout/decorators/navigation_decorator_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 describe AmaLayout::NavigationDecorator do
   let(:navigation) { FactoryBot.build(:navigation) }
   let(:navigation_presenter) { navigation.decorate }
@@ -15,53 +17,53 @@ describe AmaLayout::NavigationDecorator do
     Rails.configuration.amaabca_site = 'http://test.ama.ab.ca/'
   end
 
-  describe "#display_name_text" do
+  describe '#display_name_text' do
     let(:user) { OpenStruct.new(email: 'john.doe@test.com') }
 
-    context "name is provided" do
-      let(:name) { "John D" }
+    context 'name is provided' do
+      let(:name) { 'John D' }
       let(:nav) { AmaLayout::Navigation.new(user: user, display_name: name).decorate }
 
-      it "has a welcome message" do
-        expect(nav.display_name_text).to eq "Welcome, John D"
+      it 'has a welcome message' do
+        expect(nav.display_name_text).to eq('Welcome, John D')
       end
 
-      context "long name given" do
-        let(:name) { "A Really Really Really Really Long Name" }
+      context 'long name given' do
+        let(:name) { 'A Really Really Really Really Long Name' }
 
-        it "trucates to a total of 30 characters" do
-          expect(nav.display_name_text).to eq "Welcome, #{name.titleize}".truncate(30)
+        it 'trucates to a total of 30 characters' do
+          expect(nav.display_name_text).to eq("Welcome, #{name.titleize}".truncate(30))
         end
       end
     end
 
-    context "name is not provided" do
+    context 'name is not provided' do
       let(:nav) { AmaLayout::Navigation.new(user: user).decorate }
 
-      it "returns the user's email address" do
-        expect(nav.display_name_text).to eq user.email
+      it 'returns the email address' do
+        expect(nav.display_name_text).to eq(user.email)
       end
 
-      context "a really long email" do
+      context 'a really long email' do
         let(:user) { OpenStruct.new(email: 'areallyreallyreallylongemail@test.com') }
 
-        it "trucates to a total of 30 characters" do
-          expect(nav.display_name_text).to eq user.email.truncate(30)
+        it 'trucates to a total of 30 characters' do
+          expect(nav.display_name_text).to eq(user.email.truncate(30))
         end
       end
     end
   end
 
-  describe "#items" do
+  describe '#items' do
     before(:each) do
-      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
+      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
     end
 
-    it "returns an array of navigation items" do
+    it 'returns an array of navigation items' do
       expect(navigation_presenter.items).to be_an Array
     end
 
-    it "array contains decorated navigation items" do
+    it 'array contains decorated navigation items' do
       items = navigation_presenter.items
       items.each do |i|
         expect(i).to be_a AmaLayout::NavigationItemDecorator
@@ -76,7 +78,7 @@ describe AmaLayout::NavigationDecorator do
       end
 
       it 'returns nil' do
-        expect(navigation_presenter.mobile_links).to be_nil
+        expect(navigation_presenter.mobile_links).to eq('')
       end
     end
 
@@ -87,71 +89,124 @@ describe AmaLayout::NavigationDecorator do
     end
   end
 
-  describe "#sign_out_link" do
-    context "with user" do
-      it "returns link" do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-        expect(navigation_presenter.sign_out_link).to include "Sign Out"
+  describe '#sign_out_link' do
+    context 'with user' do
+      it 'returns link' do
+        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
+        expect(navigation_presenter.sign_out_link).to include('Sign Out')
       end
     end
 
-    context "without user" do
-      it "does not return the link" do
-        expect(navigation_presenter.sign_out_link).to eq ""
+    context 'without user' do
+      it 'does not return the link' do
+        expect(navigation_presenter.sign_out_link).to eq('')
       end
     end
   end
 
-  describe "#top_nav" do
-    context "with items" do
-      it "renders the partial" do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-        allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return "render"
-        expect(navigation_presenter.top_nav).to eq "render"
+  describe '#top_nav' do
+    context 'with items' do
+      it 'renders the partial' do
+        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
+        allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return 'render'
+        expect(navigation_presenter.top_nav).to eq('render')
       end
     end
 
-    context "without items" do
-      it "does not renders the partial" do
-        expect(navigation_presenter.top_nav).to eq nil
+    context 'without items' do
+      it 'does not renders the partial' do
+        expect(navigation_presenter.top_nav).to eq('')
       end
     end
   end
 
-  describe "#sidebar" do
-    context "with items" do
-      it "renders the partial" do
-        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-        allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return "render"
-        expect(navigation_presenter.sidebar).to eq "render"
+  describe '#sidebar' do
+    context 'with items' do
+      it 'renders the partial' do
+        allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
+        allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return 'render'
+        expect(navigation_presenter.sidebar).to eq('render')
+      end
+    end
+
+    context 'without items' do
+      it 'does not renders the partial' do
+        expect(navigation_presenter.sidebar).to eq('')
       end
     end
+  end
+
+  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(member_links).to eq('')
+      end
+    end
+
+    context 'non_member' do
+      let(:user) { FactoryBot.build(:user, :non_member) }
+
+      it 'returns nothing' do
+        expect(member_links).to eq('')
+      end
+    end
+
+    context 'status AL' do
+      let(:user) { FactoryBot.build(:user, :in_renewal_late) }
+
+      it 'returns nothing' do
+        expect(member_links).to eq('')
+      end
+    end
+
+    context 'outstanding balance' do
+      let(:user) { FactoryBot.build(:user, :outstanding_balance) }
+
+      it 'returns the manage credit cards link' do
+        expect(member_links).to include('Manage Credit Cards')
+      end
+    end
+
+    context 'member' do
+      let(:user) { FactoryBot.build(:user) }
+
+      it 'returns the manage credit cards link' do
+        expect(member_links).to include('Manage Credit Cards')
+      end
+    end
+
+    context 'in renewal' do
+      let(:user) { FactoryBot.build(:user, :in_renewal) }
 
-    context "without items" do
-      it "does not renders the partial" do
-        expect(navigation_presenter.sidebar).to eq nil
+      it 'returns the manage credit cards link' do
+        expect(member_links).to include('Manage Credit Cards')
       end
     end
   end
 
-  context "account toggle" do
-    it "in ama_layout it renders a blank partial" do
-      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-      allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return "render"
-      expect(navigation_presenter.account_toggle).to eq "render"
+  context 'account toggle' do
+    it 'in ama_layout it renders a blank partial' do
+      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
+      allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return 'render'
+      expect(navigation_presenter.account_toggle).to eq('render')
     end
 
-    it "in ama_layout it renders a blank partial" do
-      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: "member"))
-      allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return "render"
-      expect(navigation_presenter.account_toggle).to eq "render"
+    it 'in ama_layout it renders a blank partial' do
+      allow_any_instance_of(AmaLayout::Navigation).to receive(:user).and_return(OpenStruct.new(navigation: 'member'))
+      allow_any_instance_of(AmaLayout::AmaLayoutView).to receive(:render).and_return 'render'
+      expect(navigation_presenter.account_toggle).to eq('render')
     end
   end
 
-  describe "ama layout view" do
-    context "needed to allow rendering based on the view main app" do
-      it "attaches additional methods to current decorator - draper is capable of the same thing" do
-        expect(navigation_presenter.h(Helpers::AttachMethodsSample.new).additional_info).to eq "Bruce Wayne"
+  describe 'ama layout view' do
+    context 'needed to allow rendering based on the view main app' do
+      it 'attaches additional methods to current decorator - draper is capable of the same thing' do
+        expect(navigation_presenter.h(Helpers::AttachMethodsSample.new).additional_info).to eq('Bruce Wayne')
       end
     end
   end
@@ -217,7 +272,7 @@ describe AmaLayout::NavigationDecorator do
         end
 
         it 'does not return the badge markup' do
-          expect(subject.notification_badge).to be nil
+          expect(subject.notification_badge).to eq('')
         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/factories/agent_navigation.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :agent_navigation, class: AmaLayout::Agent::Navigation do
-    current_url "http://waffleemporium.ca"
+    current_url { 'http://waffleemporium.ca' }
   end
 end

data/spec/factories/navigation.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :navigation, class: AmaLayout::Navigation do
-    current_url "http://waffleemporium.ca"
+    current_url { 'http://waffleemporium.ca' }
   end
 end

data/spec/factories/navigation_item.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :navigation_item, class: AmaLayout::NavigationItem do
-    text "Gotham Overview"
-    icon "fa-tachometer"
-    link "http://waffleemporium.ca/gotica"
-    alt "Back to my dashboard"
+    text { 'Gotham Overview' }
+    icon { 'fa-tachometer' }
+    link { 'http://waffleemporium.ca/gotica' }
+    alt { 'Back to my dashboard' }
   end
 end

data/spec/factories/users.rb

@@ -1,35 +1,42 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :user, class: Class.new(OpenStruct) do
-    in_renewal false
-    member_type 'P'
-    renew_type 'R'
-    status 'A'
-    has_outstanding_balance false
-    member? true
+    in_renewal { false }
+    member_type { 'P' }
+    renew_type { 'R' }
+    status { 'A' }
+    has_outstanding_balance { false }
+    member? { true }
+    menu_key { 'member' }
 
     trait :non_member do
-      member? false
+      member? { false }
+      menu_key { 'non_member' }
     end
 
     trait :with_accr do
-      renew_type 'A'
+      renew_type { 'A' }
     end
 
     trait :with_mpp do
-      renew_type 'M'
+      renew_type { 'M' }
     end
 
     trait :in_renewal do
-      in_renewal true
+      in_renewal { true }
+      menu_key { 'member_renewal' }
     end
 
     trait :in_renewal_late do
-      in_renewal true
-      status 'AL'
+      in_renewal { true }
+      status { 'AL' }
+      menu_key { 'member_renewal_late' }
     end
 
     trait :outstanding_balance do
-      has_outstanding_balance true
+      has_outstanding_balance { true }
+      menu_key { 'member_outstanding_balance' }
     end
   end
 end