ama_layout 9.5.3 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c1438c7c2749a5dc0f2d4e5387f2aed0d407d469
-  data.tar.gz: 5298227383c4eaf41b4d2d95f0a6727c58aef6f6
+SHA256:
+  metadata.gz: a5cc2556c75c0b6a580dedc33539dcf01534af0cb208b4a75d54d6348e815192
+  data.tar.gz: 02b4d128b39f8fb3707ee56e23137a89efea094c2d2e875bd78e44c1de5700b5
 SHA512:
-  metadata.gz: 147b7d57cd1f37b129989dc4858cc98dba9bd57ee63da078887713207d41e90416bfc8d379507aec7a6c1f559bd313659a8d938fdc7161aceec3e977853578e1
-  data.tar.gz: daa69645e968279e9596488b8cff9d29f8d363558a2f021c015aaf5a38e97d50c8001d7d616f967463fc6f80671afbe38e7fdafd6ac173b131da9763c9dbf383
+  metadata.gz: 6e949fba8e7c225ebf56c7ce4eed1e452b6c3344efee0514cdbcbc50cf23ef58d28afc10ba508fe09f7642cad0b36459cabb9869e7534d9410c9fecbdb5fc144
+  data.tar.gz: 4300592222f3ec0098f0c08d112be3999dbd276455c531588f43fd515a94cdeb6c7edab05ae028abed28092776adef624af3ccdd8a8859473f07ca4e2295fec9

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.5.5
 sudo: false
 services:
   - redis-server

data/ama_layout.gemspec

@@ -1,35 +1,50 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ama_layout/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'ama_layout'
-  spec.version       = AmaLayout::VERSION
-  spec.authors       = ['Michael van den Beuken', 'Ruben Estevez', 'Jordan Babe', 'Mathieu Gilbert', 'Ryan Jones', 'Darko Dosenovic', 'Jonathan Weyermann', 'Adam Melnyk', 'Kayt Campbell', 'Kathleen Robertson', 'Jesse Doyle']
-  spec.email         = ['michael.beuken@gmail.com', 'ruben.a.estevez@gmail.com', 'jorbabe@gmail.com', 'mathieu.gilbert@ama.ab.ca', 'ryan.michael.jones@gmail.com', 'darko.dosenovic@ama.ab.ca', 'jonathan.weyermann@ama.ab.ca', 'adam.melnyk@ama.ab.ca', 'kayt.campbell@ama.ab.ca', 'kathleen.robertson@ama.ab.ca', 'jesse.doyle@ama.ab.ca']
-  spec.summary       = %q{.ama.ab.ca site layouts}
-  spec.description   = %q{.ama.ab.ca site layouts}
-  spec.homepage      = 'https://github.com/amaabca/ama_layout'
-  spec.license       = 'MIT'
+  spec.name = 'ama_layout'
+  spec.version = AmaLayout::VERSION
+  spec.authors = [
+    'Darko Dosenovic',
+    'Jesse Doyle',
+    'Kayt Wilson',
+    'Michael van den Beuken',
+    'Sinead Errity',
+    'Zoie Carnegie'
+  ]
+  spec.email = [
+    'darko.dosenovic@ama.ab.ca',
+    'jesse.doyle@ama.ab.ca',
+    'kayt.wilson@ama.ab.ca',
+    'michael.beuken@gmail.com',
+    'sinead.errity@ama.ab.ca',
+    'zoie.carnegie@ama.ab.ca'
+  ]
+  spec.summary = '.ama.ab.ca site layouts'
+  spec.description = '.ama.ab.ca site layouts'
+  spec.homepage = 'https://github.com/amaabca/ama_layout'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
+  spec.add_dependency 'browser', '~> 2.0'
   spec.add_dependency 'foundation-rails', '<= 6.4.3.0'
   spec.add_dependency 'rails', '>= 4.2'
-  spec.add_dependency 'browser', '~> 2.0'
-  spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
   spec.add_dependency 'redis-rails'
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'factory_bot'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '>= 11.0'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
 end

data/app/views/ama_layout/_manage_credit_card_link.html.erb

@@ -0,0 +1,3 @@
+<li class="small-text">
+  <%= link_to 'Manage Credit Cards', "#{Rails.configuration.gatekeeper_site}/members/credit_cards" %>
+</li>

data/app/views/ama_layout/_top_nav.html.erb

@@ -1,11 +1,19 @@
 <li class="has-submenu">
   <%= link_to navigation.display_name_text, '#', class: 'link--no-underline' %>
   <ul class="submenu menu vertical">
-    <li>
-      <%= link_to 'Online Account', Rails.configuration.gatekeeper_site %>
+    <li class="bold">
+      <%= link_to 'Account Settings', "#{Rails.configuration.gatekeeper_site}/user/edit" %>
     </li>
-    <li><%= link_to 'AMA Website', Rails.configuration.amaabca_site %></li>
-    <li><a href="http://amaroadreports.ca/">AMA Road Reports</a></li>
+    <li class="small-text">
+      <%= link_to 'Change Email/Password', "#{Rails.configuration.gatekeeper_site}/user/edit" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Email Subscriptions', "#{Rails.configuration.youraccount_site}/subscriptions" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Update Address', "#{Rails.configuration.youraccount_site}/membership_update/new" %>
+    </li>
+    <%= navigation.manage_credit_card_link %>
     <%= navigation.sign_out_link %>
   </ul>
 </li>

data/config.ru

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require "rubygems"
+require "bundler"
+
+Bundler.require :default, :development
+
+Combustion.initialize! :all
+run Combustion::Application

data/lib/ama_layout/decorators/agent/navigation_decorator.rb

@@ -12,18 +12,21 @@ module AmaLayout
       end
 
       def sign_out_link
-        return "" unless user
-        h.render partial: "ama_layout/sign_out_link"
+        return '' unless user
+
+        h.render partial: 'ama_layout/sign_out_link'
       end
 
       def top_nav
-        return "" unless user
-        h.render partial: "ama_layout/agent/top_nav", locals: { navigation: self }
+        return '' unless user
+
+        h.render partial: 'ama_layout/agent/top_nav', locals: { navigation: self }
       end
 
       def sidebar
-        return "" unless user
-        h.render partial: "ama_layout/sidebar", locals: { navigation: self }
+        return '' unless user
+
+        h.render partial: 'ama_layout/sidebar', locals: { navigation: self }
       end
 
       def cash_drawer_name

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AmaLayout
   class NavigationDecorator
     include AmaLayout::DraperReplacement
@@ -11,16 +13,27 @@ module AmaLayout
     end
 
     def sign_out_link
-      return "" unless user
-      h.render partial: "ama_layout/sign_out_link"
+      return '' unless user
+
+      h.render partial: 'ama_layout/sign_out_link'
+    end
+
+    def manage_credit_card_link
+      return '' unless user && %w[member member_renewal member_outstanding_balance].include?(user.try(:menu_key))
+
+      h.render partial: 'ama_layout/manage_credit_card_link'
     end
 
     def top_nav
-      h.render partial: "ama_layout/top_nav", locals: { navigation: self } if user
+      return '' unless user
+
+      h.render partial: 'ama_layout/top_nav', locals: { navigation: self }
     end
 
     def sidebar
-      h.render partial: "ama_layout/sidebar", locals: { navigation: self } if items.any?
+      return '' if items.none?
+
+      h.render partial: 'ama_layout/sidebar', locals: { navigation: self }
     end
 
     def name_or_email
@@ -28,42 +41,44 @@ module AmaLayout
     end
 
     def account_toggle(view_data = {})
-      h(view_data).render partial: "account_toggle"
+      h(view_data).render partial: 'account_toggle'
     end
 
     def notification_icon
-      if user
-        h.render 'ama_layout/notification_icon', navigation: self
-      end
+      return '' unless user
+
+      h.render 'ama_layout/notification_icon', navigation: self
     end
 
     def mobile_notification_icon
-      if user
-        h.render 'ama_layout/mobile_notification_icon', navigation: self
-      end
+      return '' unless user
+
+      h.render 'ama_layout/mobile_notification_icon', navigation: self
     end
 
     def mobile_links
-      h.render 'ama_layout/mobile_links' unless user
+      return '' if user
+
+      h.render 'ama_layout/mobile_links'
     end
 
     def notification_badge
-      if new_notifications?
-        h.content_tag(
-          :div,
-          active_notification_count,
-          class: 'notification__badge',
-          data: {
-            notification_count: true
-          }
-        )
-      end
+      return '' unless new_notifications?
+
+      h.content_tag(
+        :div,
+        active_notification_count,
+        class: 'notification__badge',
+        data: {
+          notification_count: true
+        }
+      )
     end
 
     def notification_sidebar
-      if user
-        h.render 'ama_layout/notification_sidebar', navigation: self, notifications: decorated_notifications
-      end
+      return '' unless user
+
+      h.render 'ama_layout/notification_sidebar', navigation: self, notifications: decorated_notifications
     end
 
     def notifications_heading
@@ -85,7 +100,7 @@ module AmaLayout
     end
 
     def new_notifications?
-      active_notification_count > 0
+      active_notification_count.positive?
     end
   end
 end

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/version.rb

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

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,123 @@ 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 '#manage_credit_card_link' do
+    let(:navigation) { FactoryBot.build(:navigation, user: user) }
+
+    context 'nil user' do
+      let(:user) {}
+
+      it 'returns nothing' do
+        expect(navigation_presenter.manage_credit_card_link).to eq('')
+      end
+    end
+
+    context 'non_member' do
+      let(:user) { FactoryBot.build(:user, :non_member) }
+
+      it 'returns nothing' do
+        expect(navigation_presenter.manage_credit_card_link).to eq('')
+      end
+    end
+
+    context 'status AL' do
+      let(:user) { FactoryBot.build(:user, :in_renewal_late) }
+
+      it 'returns nothing' do
+        expect(navigation_presenter.manage_credit_card_link).to eq('')
+      end
+    end
+
+    context 'outstanding balance' 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')
+      end
+    end
+
+    context 'member' 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')
+      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(navigation_presenter.manage_credit_card_link).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 +271,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/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

data/spec/internal/db/schema.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
-  #
+  # Set up any tables you need to exist for your test suite that don't belong
+  # in migrations.
 end

metadata

@@ -1,81 +1,76 @@
 --- !ruby/object:Gem::Specification
 name: ama_layout
 version: !ruby/object:Gem::Version
-  version: 9.5.3
+  version: 10.0.1
 platform: ruby
 authors:
-- Michael van den Beuken
-- Ruben Estevez
-- Jordan Babe
-- Mathieu Gilbert
-- Ryan Jones
 - Darko Dosenovic
-- Jonathan Weyermann
-- Adam Melnyk
-- Kayt Campbell
-- Kathleen Robertson
 - Jesse Doyle
+- Kayt Wilson
+- Michael van den Beuken
+- Sinead Errity
+- Zoie Carnegie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: foundation-rails
+  name: breadcrumbs_on_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.3.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 6.4.3.0
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: browser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: browser
+  name: foundation-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 6.4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 6.4.3.0
 - !ruby/object:Gem::Dependency
-  name: breadcrumbs_on_rails
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: redis-rails
   requirement: !ruby/object:Gem::Requirement
@@ -96,30 +91,30 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: combustion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -133,7 +128,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -147,21 +142,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -175,7 +170,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: combustion
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -218,23 +213,19 @@ dependencies:
         version: '0'
 description: ".ama.ab.ca site layouts"
 email:
-- michael.beuken@gmail.com
-- ruben.a.estevez@gmail.com
-- jorbabe@gmail.com
-- mathieu.gilbert@ama.ab.ca
-- ryan.michael.jones@gmail.com
 - darko.dosenovic@ama.ab.ca
-- jonathan.weyermann@ama.ab.ca
-- adam.melnyk@ama.ab.ca
-- kayt.campbell@ama.ab.ca
-- kathleen.robertson@ama.ab.ca
 - jesse.doyle@ama.ab.ca
+- kayt.wilson@ama.ab.ca
+- michael.beuken@gmail.com
+- sinead.errity@ama.ab.ca
+- zoie.carnegie@ama.ab.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
 - Gemfile
@@ -274,6 +265,7 @@ files:
 - 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
@@ -294,6 +286,7 @@ files:
 - app/views/ama_layout/agent/_siteheader.html.erb
 - app/views/ama_layout/agent/_top_nav.html.erb
 - app/views/application/_account_toggle.html.erb
+- config.ru
 - config/routes.rb
 - lib/ama_layout.rb
 - lib/ama_layout/agent/navigation.rb
@@ -350,6 +343,7 @@ files:
 - spec/helpers/ama_layout_breadcrumb_helper_spec.rb
 - spec/helpers/ama_layout_content_helper_spec.rb
 - spec/helpers/ama_layout_path_helper_spec.rb
+- spec/internal/app/assets/config/manifest.js
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/pages_controller.rb
 - spec/internal/config/database.yml
@@ -380,7 +374,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: ".ama.ab.ca site layouts"
@@ -415,6 +409,7 @@ test_files:
 - spec/helpers/ama_layout_breadcrumb_helper_spec.rb
 - spec/helpers/ama_layout_content_helper_spec.rb
 - spec/helpers/ama_layout_path_helper_spec.rb
+- spec/internal/app/assets/config/manifest.js
 - spec/internal/app/controllers/application_controller.rb
 - spec/internal/app/controllers/pages_controller.rb
 - spec/internal/config/database.yml