pugin 1.6.10 → 1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 598f13c1c484ebd41c4063e2eca63815d9354db0
-  data.tar.gz: 635c83954dd9a9757a3d357e042aaeaee79b9fbb
+  metadata.gz: 5f61fc187179831aa8db8dfc5aaef380882dd060
+  data.tar.gz: f3aed9148a2d6588cc13b1311b832fdc496ee824
 SHA512:
-  metadata.gz: 1dc29556f5b6a8a0f1419b4bb71dbe93bafb9e75c6ff443d27a96b6b13a3a3946606fa2029d9f547521a34bfbbfbfda2c9cb7d62b1be8d7b2de27ce7c33dcdc8
-  data.tar.gz: 880812ef674ffaeaf5c5dc8fcbb76291d8fc14b9cf324eef1d5d4b44d970c98fa133a8e4c17a70f37e146015c670db8c7dd020f627f139ef9d007540a17b0ebc
+  metadata.gz: 29a52f53eee2aedaf4be4419c945b07d2d80cef5ada613bc6ca3a5befca277492a49c3283ebdac6caccf3e90c277bcfadecede619d04535e841edd5a603bba48
+  data.tar.gz: 9e054e42746e1ab1ef5364722aec08bb1d2b4303bcc2eaa7ad351215d157c82a10b7fb9206a2591ad1eb7abda0c6fcf73f09ab1a11d34ab519220513290d3f91

data/app/views/pugin/icons/_close.html.haml

@@ -1,4 +1,4 @@
-%svg{"data-icon" => "close", :focusable => "false", :height => "20", :viewbox => "0 0 20 20", :width => "20", :xmlns => "http://www.w3.org/2000/svg"}
+%svg{ width: '20', height: '20', viewbox: '0 0 20 20', xmlns: 'http://www.w3.org/2000/svg', aria:{ hidden: 'true' }, data:{ icon: 'close' } }
   %title Cross
   %g{:stroke => "#fff"}
     %g

data/app/views/pugin/icons/_download.html.haml

@@ -1,4 +1,4 @@
-%svg{ width: '38', height: '50', viewbox: '0 0 38 50', focusable: 'false', xmlns: 'http://www.w3.org/2000/svg' }
+%svg{ width: '38', height: '50', viewbox: '0 0 38 50', xmlns: 'http://www.w3.org/2000/svg', aria:{ hidden: 'true' } }
   %title Download icon
   %g{ data:{ icon:'download' } }
     %polygon{ points: '37 44 1 44 1 50 37 50' }

data/app/views/pugin/icons/_file.html.haml

@@ -1,4 +1,4 @@
-%svg{ width: '100', height: '108', viewbox: '0 0 100 108', focusable: 'false', xmlns: 'http://www.w3.org/2000/svg' }
+%svg{ width: '100', height: '108', viewbox: '0 0 100 108', xmlns: 'http://www.w3.org/2000/svg', aria:{ hidden: 'true' } }
   %title File icons
   %g{ data:{ icon:'file' } }
     %g{ data:{ icon:'page' }, stroke: 'none', fill: 'none', fill:{ rule: 'evenodd' } }
@@ -6,9 +6,9 @@
       %g{ data:{ icon: 'page-attributes' }, fill:{ rule: 'nonzero' } }
         %path{ data:{ icon: 'page-border' }, fill: '#cbc9cd', d: 'M2.01108433,2.00736845 L2.00021277,106.007368 L84.0002128,106.007368 L84.0002128,31.8971133 L55.246835,2.20661616 L2.01108433,2.00736845 Z M0.0112761248,0 L55.9803815,0 L86,31.0757723 L86,108 L0,108 L0.0112761248,0 Z' }
         %polygon{ data:{ icon:'page-fold' }, fill: '#cbc9cd', points: '83.0826977 29.9827586 85.0851064 31.9827586 53.9787234 31.9827586 53.9787234 0.913793103 55.9787234 2.91138733 55.9787234 29.9827586' }
-    %g{ data:{ icon:'success' }, transform: 'translate(70.000000, 66.000000)' }
-      %circle{ data:{ icon:'success-background' }, fill: '#00b95d', cx: '15', cy: '15', fill:{ rule: 'nonzero' }, r: '15' }
-      %polyline{ data:{ icon:'success-text' }, fill: 'none', stroke: '#f8f7f7', stroke:{ width: '3' }, transform: 'translate(15.485282, 11.985281) rotate(-45.000000) translate(-15.485282, -11.985281)', points: '8.98528165 7.9852813 8.98528165 15.9852813 21.9852817 15.9852813' }
+    %g{ data:{ icon:'success' }, fill:{ rule: 'nonzero' }, transform: 'translate(70.000000, 66.000000)' }
+      %circle{ data:{ icon:'success-background' }, fill: '#00b95d', cx: '15', cy: '15', r: '15' }
+      %polyline{ data:{ icon:'success-text' }, :points => '8.98528137 7.98528137 8.98528137 15.9852814 21.9852814 15.9852814', :stroke => '#f8f7f7', 'stroke-width' => '3', :fill => 'none', :transform => 'translate(15.485281, 11.985281) rotate(-45.000000) translate(-15.485281, -11.985281) '}
     %g{ data:{ icon:'failure' }, fill:{ rule: 'nonzero' }, transform: 'translate(70.000000, 66.000000)' }
       %circle{ data:{ icon:'failure-background' }, fill: '#de2e32', cx: '15', cy: '15', r: '15' }
       %path{ data:{ icon:'failure-text' }, fill: '#f8f7f7', d: 'M16.8961039,7 L16.012987,17.7474747 L13.9350649,17.7474747 L13.0779221,7 L16.8961039,7 Z M13,21.0606061 C13,20.4859679 13.1904743,20.0190815 13.5714286,19.6599327 C13.9523829,19.3007838 14.4199106,19.1212121 14.974026,19.1212121 C15.5454574,19.1212121 16.0259721,19.3007838 16.4155844,19.6599327 C16.8051968,20.0190815 17,20.4859679 17,21.0606061 C17,21.6352442 16.8051968,22.1021306 16.4155844,22.4612795 C16.0259721,22.8204283 15.5454574,23 14.974026,23 C14.4199106,23 13.9523829,22.8204283 13.5714286,22.4612795 C13.1904743,22.1021306 13,21.6352442 13,21.0606061 Z' }

data/app/views/pugin/icons/_search.html.haml

@@ -1,4 +1,4 @@
-%svg{"data-icon" => "search", :focusable => "false", :height => "20", :viewbox => "0 0 20 20", :width => "20", :xmlns => "http://www.w3.org/2000/svg"}
+%svg{ width: '20', height: '20', viewbox: '0 0 20 20', xmlns: 'http://www.w3.org/2000/svg', aria:{ hidden: 'true' }, data:{ icon: 'search' } }
   %title Search icon
   %g{:fill => "#fff"}
     %path{:d => "M7.5 15C3.4 15 0 11.6 0 7.5 0 3.4 3.4 0 7.5 0 11.6 0 15 3.4 15 7.5 15 11.6 11.6 15 7.5 15ZM7.5 13C10.5 13 13 10.5 13 7.5 13 4.5 10.5 2 7.5 2 4.5 2 2 4.5 2 7.5 2 10.5 4.5 13 7.5 13Z"}

data/app/views/pugin/icons/_uk-parliament.html.haml

@@ -1,4 +1,4 @@
-%svg{:height => "54", :viewbox => "0 0 269 68", :width => "214", :xmlns => "http://www.w3.org/2000/svg"}
+%svg{ width: '214', height: '54', viewbox: '0 0 269 68', xmlns: 'http://www.w3.org/2000/svg', aria:{ hidden: 'true' } }
   %title UK Parliament
 
   %g{"data-icon" => "portcullis", :fill => "#fff"}

data/app/views/pugin/layouts/_layout.html.haml

@@ -18,9 +18,9 @@
     - Pugin.alternates.each do |alternate|
       %link{rel: 'alternate', type: alternate[:type], href: alternate[:href].html_safe}
   %body
-    = render partial: 'pugin/javascript/has_js'
     - if ENV['GTM_KEY']
       = render partial: 'pugin/javascript/google_tag_manager_noscript'
+    = render partial: 'pugin/javascript/has_js'
     = render partial: 'pugin/elements/skip-content'
     = render partial: 'pugin/components/status-cookie'
     = render partial: 'pugin/components/status', locals: { status: nil } if Pugin::Feature::StatusBanner.enabled?

data/app/views/pugin/people/list/_list.html.haml

@@ -1,4 +1,2 @@
-- person_type = (people.current_mp? || people.former_mp?) ? "member" : "lord"
-
 %li
-  = render partial: "pugin/people/list/#{person_type}/#{person_type}", locals: { "#{person_type}": local_assigns.fetch(:people, []), as: person_type }
+  = render partial: "pugin/people/list/#{people.person_type}/#{people.person_type}", locals: { "#{people.person_type}": local_assigns.fetch(:people, []), as: people.person_type }

data/app/views/pugin/people/list/lord/_lord.html.haml

@@ -1,4 +1,3 @@
-- current_incumbency = lord.seat_incumbencies.sort{ |inc_a, inc_b| inc_b.start_date <=> inc_a.start_date }.first
 - if Pugin::Feature::Bandiera.show_list_images?
   %figure
     %a{href: "/people/#{lord.graph_id}", tabindex: "-1"}
@@ -9,20 +8,19 @@
           %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
 .list--details
-  - if !instance_variable_get("@parliament").nil? # parliament lord
+  %h2
+    %a{href: "/people/#{lord.graph_id}"}= lord.display_name
 
-  - elsif current_incumbency&.current? # current lord
-    %h2
-      %a{href: "/people/#{lord.graph_id}"}= lord.display_name
-    - unless lord.statuses[:house_membership_status].empty? && !lord.statuses[:house_membership_status].include?('Current MP')
-      %p= lord.statuses[:house_membership_status].join(' and ')
-    - unless lord.parties.empty?
-      - party_membership = lord.party_memberships.select(&:current?).first
-      - unless party_membership.nil?
-        %p= party_membership.party.name
+  -# Currently only takes the most recent incumbency as part of that parliamentary period
+  - most_recent_incumbency = lord.most_recent_seat_incumbency
+
+  - if @parliament # parliament lord
+    %p= "Member of the #{t('house_of_lords')}"
+    %p= lord&.parties&.first&.name
+
+  - elsif most_recent_incumbency&.current? # current lord
+    %p= lord.statuses[:house_membership_status].join(' and ')
+    %p= lord.try(:current_party).try(:name)
 
   - else # former lord
-    %h2
-      %a{href: "/people/#{lord.graph_id}"}= lord.display_name
-    - unless lord.statuses[:house_membership_status].empty? && !lord.statuses[:house_membership_status].include?('Current MP')
-      %p= lord.statuses[:house_membership_status].join(' and ')
+    %p= lord.statuses[:house_membership_status].join(' and ')

data/app/views/pugin/people/list/member/_member.html.haml

@@ -1,5 +1,3 @@
-- current_incumbency = member.seat_incumbencies.select(&:current?).first
-
 - if Pugin::Feature::Bandiera.show_list_images?
   %figure
     %a{href: "/people/#{member.graph_id}", tabindex: "-1"}
@@ -10,35 +8,23 @@
           %img{ src: "#{Pugin::ASSET_LOCATION_URL}/#{Pugin::ASSET_VERSION}/images/placeholder_members_image.png", alt: "" }
 
 .list--details
-  - if !instance_variable_get("@parliament").nil? # parliament member
-    %h2
-      %a{href: "/people/#{member.graph_id}"}= member.display_name
-    - unless member.constituencies.empty?
-      - unless member.seat_incumbencies.nil?
-        - member.seat_incumbencies.each do |seat_incumbency|
-          %p
-            = "#{seat_incumbency.constituency.name} from #{l(seat_incumbency.start_date, format: :default)}"
-            = seat_incumbency.end_date.nil? ? "#{I18n.t('shared.to_present')}" : "- #{l(seat_incumbency.end_date, format: :default)}"
+  %h2
+    %a{href: "/people/#{member.graph_id}"}= member.display_name
 
-    - unless member.parties.empty?
-      - member.party_memberships.each do |party_membership|
-        %p= party_membership.party.name
+  -# Currently only takes the most recent incumbency as part of that parliamentary period
+  - parliament_incumbency = member.most_recent_seat_incumbency
+  - current_incumbency = member.current_seat_incumbency
 
-  - elsif !current_incumbency.nil? # current member
-    %h2
-      %a{href: "/people/#{member.graph_id}"}= member.display_name
-    - unless member.constituencies.empty?
-      - seat_incumbency = member.seat_incumbencies.select(&:current?).first
-      - unless seat_incumbency.nil?
-        %p= "#{I18n.t('pugin.people.list.member.mp_for')} #{seat_incumbency.constituency.name}"
-    - unless member.parties.empty?
-      - party_membership = member.party_memberships.select(&:current?).first
-      - unless party_membership.nil?
-        %p= party_membership.party.name
+  - if @parliament # parliament member
+    - if parliament_incumbency&.constituency && parliament_incumbency&.start_date
+      %p
+        = "#{parliament_incumbency.constituency.name} from #{l(parliament_incumbency.start_date, format: :default)}"
+        = parliament_incumbency&.end_date.nil? ? "#{I18n.t('shared.to_present')}" : "- #{l(parliament_incumbency.end_date, format: :default)}"
+      %p= member&.parties&.first&.name
 
-  - else # former member
+  - elsif current_incumbency&.constituency # current member
+    %p= "#{I18n.t('pugin.people.list.member.mp_for')} #{current_incumbency&.constituency&.name}"
+    %p= member.try(:current_party).try(:name)
 
-    %h2
-      %a{href: "/people/#{member.graph_id}"}= member.display_name
-    - unless member.statuses[:house_membership_status].empty? && !member.statuses[:house_membership_status].include?('Current MP')
-      %p= member.statuses[:house_membership_status].join(' and ')
+  - else # former member
+    %p= member.statuses[:house_membership_status].join(' and ')

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
-  time: 
+  #global people translations
+  house_of_lords: 'House of Lords'
+  time:
     formats:
       year_only: "%Y"
   pugin:

data/lib/pugin.rb

@@ -1,7 +1,7 @@
 require 'pugin/version'
 
 module Pugin
-  ASSET_VERSION = '1.7.3'.freeze
+  ASSET_VERSION = '1.7.4'.freeze
   ASSET_LOCATION_URL = ENV.fetch('ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.pugin-website')
   STATIC_ASSET_LOCATION_URL = ENV.fetch('STATIC_ASSET_LOCATION_URL', 'https://s3-eu-west-1.amazonaws.com/web1live.static-assets')
   class << self

data/lib/pugin/version.rb

@@ -1,3 +1,3 @@
 module Pugin
-  VERSION = '1.6.10'.freeze
+  VERSION = '1.6.11'.freeze
 end

data/spec/fixtures/_header.html

@@ -1,7 +1,7 @@
 <header>
 <div class='container'>
 <a class='uk_parliament' href='/'>
-<svg height='54' viewbox='0 0 269 68' width='214' xmlns='http://www.w3.org/2000/svg'>
+<svg aria-hidden='true' height='54' viewbox='0 0 269 68' width='214' xmlns='http://www.w3.org/2000/svg'>
 <title>UK Parliament</title>
 <g data-icon='portcullis' fill='#fff'>
 <path d='M52.9 4.1L52.2 4.5C53 6 53.2 7.9 52.7 9.6 51.8 8.9 51.2 8 51 7L50.3 7.4C49.8 9.4 48.9 11.4 47.7 13.2L47.9 13.9C48.6 13.5 49.4 13.3 50.2 13.4 50.5 13.4 50.7 13.4 51 13.4 50.3 15.1 48.7 16.2 46.9 16.2 45.1 16.3 43.5 15.3 42.7 13.7 43.2 13.5 43.6 13 43.8 12.4 44 11.5 43.4 11.1 43.6 10.2 43.8 9.4 44.5 8.9 45.2 8.9 46 9 46.7 9.5 46.8 10.3 47.5 9.9 47.9 9.1 47.8 8.3 47.7 7.5 47.2 6.8 46.4 6.6 45.7 6.3 44.8 6.5 44.3 7.1 44.6 6.6 44.8 6.1 44.9 5.6 45.1 4.3 44.9 3 44.1 2 42.9 2.6 42 3.7 41.8 5 41.6 5.5 41.6 6.1 41.7 6.6 41.4 5.9 40.7 5.3 39.9 5.3 39.1 5.2 38.4 5.6 38 6.3 37.6 7 37.6 7.8 38.1 8.5 38.5 7.8 39.3 7.6 40 7.9 40.7 8.2 41.1 8.9 41 9.7 40.8 10.5 40.1 10.7 39.9 11.6 39.8 12.1 39.9 12.6 40.2 13L40.3 13.2C38.7 14.4 36.5 14.7 34.7 13.8 32.8 12.9 31.7 11 31.7 9L31.7 8.5C33.3 8.8 34.8 9.6 35.9 10.9L36.5 10.3 36.5 3.9 35.9 3.3C34.8 4.5 33.3 5.3 31.7 5.6 31.6 3.3 33.2 1.3 35.4 0.8L34.8 0.2C33.2 0.1 31.6 0 30 0 28.4 0 26.8 0.1 25.2 0.2L24.6 0.8C26.8 1.3 28.4 3.3 28.4 5.6 26.7 5.3 25.2 4.5 24.1 3.3L23.5 3.9 23.5 10.3 24.1 10.8C25.2 9.6 26.7 8.8 28.4 8.5L28.4 9C28.3 11 27.2 12.9 25.4 13.8 23.5 14.7 21.4 14.5 19.7 13.2L19.8 13.1C20.1 12.6 20.2 12.1 20.1 11.6 19.9 10.7 19.2 10.6 19 9.7 18.8 9 19.2 8.2 20 7.9 20.7 7.6 21.5 7.8 22 8.5 22.4 7.8 22.4 7 22 6.3 21.6 5.6 20.9 5.2 20.1 5.3 19.3 5.3 18.6 5.9 18.3 6.6 18.4 6.1 18.4 5.5 18.2 5 18 3.7 17.1 2.6 15.9 2 15.1 3 14.8 4.4 15.1 5.7 15.2 6.2 15.4 6.7 15.7 7.2 15.1 6.6 14.3 6.4 13.5 6.7 12.8 6.9 12.2 7.6 12.2 8.4 12.1 9.2 12.5 10 13.2 10.4 13.3 9.6 13.9 9.1 14.7 9 15.5 9 16.2 9.5 16.4 10.3 16.6 11.2 16 11.6 16.2 12.4 16.3 13 16.7 13.5 17.3 13.8 16.5 15.4 14.8 16.3 13 16.3 11.3 16.2 9.7 15.1 9 13.5 9.3 13.4 9.5 13.4 9.8 13.4 10.6 13.4 11.4 13.6 12.1 14L12.3 13.2C11.1 11.4 10.2 9.5 9.6 7.4L9 7C8.8 8 8.2 8.9 7.3 9.6 6.8 7.9 7 6 7.8 4.5L7.1 4.1C6 4.5 4.3 5.2 3.1 5.7L10 21.1C22.7 15.5 37.2 15.5 50 21.1L56.8 5.7C55.7 5.2 54.1 4.5 52.9 4.1Z'></path>

data/spec/fixtures/_header_with_search.html

@@ -1,7 +1,7 @@
 <header>
 <div class='container'>
 <a class='uk_parliament' href='/'>
-<svg height='54' viewbox='0 0 269 68' width='214' xmlns='http://www.w3.org/2000/svg'>
+<svg aria-hidden='true' height='54' viewbox='0 0 269 68' width='214' xmlns='http://www.w3.org/2000/svg'>
 <title>UK Parliament</title>
 <g data-icon='portcullis' fill='#fff'>
 <path d='M52.9 4.1L52.2 4.5C53 6 53.2 7.9 52.7 9.6 51.8 8.9 51.2 8 51 7L50.3 7.4C49.8 9.4 48.9 11.4 47.7 13.2L47.9 13.9C48.6 13.5 49.4 13.3 50.2 13.4 50.5 13.4 50.7 13.4 51 13.4 50.3 15.1 48.7 16.2 46.9 16.2 45.1 16.3 43.5 15.3 42.7 13.7 43.2 13.5 43.6 13 43.8 12.4 44 11.5 43.4 11.1 43.6 10.2 43.8 9.4 44.5 8.9 45.2 8.9 46 9 46.7 9.5 46.8 10.3 47.5 9.9 47.9 9.1 47.8 8.3 47.7 7.5 47.2 6.8 46.4 6.6 45.7 6.3 44.8 6.5 44.3 7.1 44.6 6.6 44.8 6.1 44.9 5.6 45.1 4.3 44.9 3 44.1 2 42.9 2.6 42 3.7 41.8 5 41.6 5.5 41.6 6.1 41.7 6.6 41.4 5.9 40.7 5.3 39.9 5.3 39.1 5.2 38.4 5.6 38 6.3 37.6 7 37.6 7.8 38.1 8.5 38.5 7.8 39.3 7.6 40 7.9 40.7 8.2 41.1 8.9 41 9.7 40.8 10.5 40.1 10.7 39.9 11.6 39.8 12.1 39.9 12.6 40.2 13L40.3 13.2C38.7 14.4 36.5 14.7 34.7 13.8 32.8 12.9 31.7 11 31.7 9L31.7 8.5C33.3 8.8 34.8 9.6 35.9 10.9L36.5 10.3 36.5 3.9 35.9 3.3C34.8 4.5 33.3 5.3 31.7 5.6 31.6 3.3 33.2 1.3 35.4 0.8L34.8 0.2C33.2 0.1 31.6 0 30 0 28.4 0 26.8 0.1 25.2 0.2L24.6 0.8C26.8 1.3 28.4 3.3 28.4 5.6 26.7 5.3 25.2 4.5 24.1 3.3L23.5 3.9 23.5 10.3 24.1 10.8C25.2 9.6 26.7 8.8 28.4 8.5L28.4 9C28.3 11 27.2 12.9 25.4 13.8 23.5 14.7 21.4 14.5 19.7 13.2L19.8 13.1C20.1 12.6 20.2 12.1 20.1 11.6 19.9 10.7 19.2 10.6 19 9.7 18.8 9 19.2 8.2 20 7.9 20.7 7.6 21.5 7.8 22 8.5 22.4 7.8 22.4 7 22 6.3 21.6 5.6 20.9 5.2 20.1 5.3 19.3 5.3 18.6 5.9 18.3 6.6 18.4 6.1 18.4 5.5 18.2 5 18 3.7 17.1 2.6 15.9 2 15.1 3 14.8 4.4 15.1 5.7 15.2 6.2 15.4 6.7 15.7 7.2 15.1 6.6 14.3 6.4 13.5 6.7 12.8 6.9 12.2 7.6 12.2 8.4 12.1 9.2 12.5 10 13.2 10.4 13.3 9.6 13.9 9.1 14.7 9 15.5 9 16.2 9.5 16.4 10.3 16.6 11.2 16 11.6 16.2 12.4 16.3 13 16.7 13.5 17.3 13.8 16.5 15.4 14.8 16.3 13 16.3 11.3 16.2 9.7 15.1 9 13.5 9.3 13.4 9.5 13.4 9.8 13.4 10.6 13.4 11.4 13.6 12.1 14L12.3 13.2C11.1 11.4 10.2 9.5 9.6 7.4L9 7C8.8 8 8.2 8.9 7.3 9.6 6.8 7.9 7 6 7.8 4.5L7.1 4.1C6 4.5 4.3 5.2 3.1 5.7L10 21.1C22.7 15.5 37.2 15.5 50 21.1L56.8 5.7C55.7 5.2 54.1 4.5 52.9 4.1Z'></path>
@@ -30,7 +30,7 @@
 <label class='sr-only' for='search_global'>Enter a keyword</label>
 <input id='search_global' maxlength='1000' name='q' pattern='^(?!.*&lt;script|&lt;Script).*$' required='' type='search'>
 <button aria-label='submit search' class='btn--white' data-tracking='search' tabindex='-1' type='submit'>
-<svg data-icon='search' focusable='false' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
+<svg aria-hidden='true' data-icon='search' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
 <title>Search icon</title>
 <g fill='#fff'>
 <path d='M7.5 15C3.4 15 0 11.6 0 7.5 0 3.4 3.4 0 7.5 0 11.6 0 15 3.4 15 7.5 15 11.6 11.6 15 7.5 15ZM7.5 13C10.5 13 13 10.5 13 7.5 13 4.5 10.5 2 7.5 2 4.5 2 2 4.5 2 7.5 2 10.5 4.5 13 7.5 13Z'></path>
@@ -42,7 +42,7 @@
 </div>
 </form>
 <a aria-label='open search' class='search__global__toggle' href='#'>
-<svg data-icon='search' focusable='false' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
+<svg aria-hidden='true' data-icon='search' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
 <title>Search icon</title>
 <g fill='#fff'>
 <path d='M7.5 15C3.4 15 0 11.6 0 7.5 0 3.4 3.4 0 7.5 0 11.6 0 15 3.4 15 7.5 15 11.6 11.6 15 7.5 15ZM7.5 13C10.5 13 13 10.5 13 7.5 13 4.5 10.5 2 7.5 2 4.5 2 2 4.5 2 7.5 2 10.5 4.5 13 7.5 13Z'></path>
@@ -50,7 +50,7 @@
 </g>
 </svg>
 
-<svg data-icon='close' focusable='false' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
+<svg aria-hidden='true' data-icon='close' height='20' viewbox='0 0 20 20' width='20' xmlns='http://www.w3.org/2000/svg'>
 <title>Cross</title>
 <g stroke='#fff'>
 <g>

data/spec/lib/pugin/helpers/controller_helpers_spec.rb

@@ -1,42 +1,43 @@
 require 'spec_helper'
 require 'pugin/helpers/controller_helpers'
 
-describe 'pugin/helpers/controller_helpers.rb' do 
+describe 'pugin/helpers/controller_helpers.rb' do
 
-	before do 
+	before do
 		class TestClass
 			include Pugin::Helpers::ControllerHelpers
-		end 
+		end
 	end
 
 	subject { TestClass.new }
 
 	context '#enable_status_banner' do
-		it 'enables the status banner' do 
+		it 'enables the status banner' do
 			subject.enable_status_banner
 			expect(Pugin::Feature::StatusBanner.enabled?).to equal(true)
 		end
 	end
-	context '#disable_status_banner' do 
 
-		before :each do 
+	context '#disable_status_banner' do
+		before :each do
 			Pugin::Feature::StatusBanner.enable
 		end
 
-		it 'disables the status banner' do 
+		it 'disables the status banner' do
 			expect(Pugin::Feature::StatusBanner.disabled?).to equal(false)
 			subject.disable_status_banner
 			expect(Pugin::Feature::StatusBanner.disabled?).to equal(true)
 		end
 	end
+
 	context '#enable_global_search' do
 		it 'enables the global search' do
 			subject.enable_global_search
 			expect(Pugin::Feature::GlobalSearch.enabled?).to equal(true)
 		end
 	end
-	context '#disable_global_search' do
 
+	context '#disable_global_search' do
 		before :each do
 			Pugin::Feature::GlobalSearch.enable
 		end
@@ -47,25 +48,27 @@ describe 'pugin/helpers/controller_helpers.rb' do
 			expect(Pugin::Feature::GlobalSearch.disabled?).to equal(true)
 		end
 	end
-	context '#enable_top_navigation' do 
-		it 'enables the top navigation' do 
+
+	context '#enable_top_navigation' do
+		it 'enables the top navigation' do
 			subject.enable_top_navigation
 			expect(Pugin::Feature::TopNavigation.enabled?).to equal(true)
 		end
 	end
-	context '#disable_top_navigation' do 
 
-		before :each do 
+	context '#disable_top_navigation' do
+		before :each do
 			Pugin::Feature::TopNavigation.enable
 		end
 
-		it 'disables the top navigation' do 
+		it 'disables the top navigation' do
 			expect(Pugin::Feature::TopNavigation.disabled?).to equal(false)
 			subject.disable_top_navigation
 			expect(Pugin::Feature::TopNavigation.disabled?).to equal(true)
 		end
 	end
-	context '#reset_bandiera_features' do 
+	
+	context '#reset_bandiera_features' do
 		before :each do
 			Pugin::Feature::Bandiera.instance_variable_set(:@features, {'show-register' => true, 'show-dissolution' => true})
 		end

data/spec/views/pugin/components/_header.html.haml_spec.rb

@@ -2,23 +2,23 @@ require 'spec_helper'
 require 'haml'
 
 describe 'pugin/components/_header.html.haml', type: :view do
-
 	context 'with global_search flag turned on' do
 		before :each do
 			allow(Pugin::Feature::GlobalSearch).to receive(:enabled?).and_return(true)
 		end
-
 		it 'renders as expected' do
-        render
-        expect(response).to eq(File.read(File.join(Rails.root, '../fixtures', '_header_with_search.html')))
-      end
+      render
+      expect(response).to eq(File.read(File.join(Rails.root, '../fixtures', '_header_with_search.html')))
+    end
 	end
 
 	context 'without global_search flag turned on' do
+		before :each do
+			allow(Pugin::Feature::GlobalSearch).to receive(:enabled?).and_return(false)
+		end
 		it 'renders as expected' do
 			render
 			expect(response).to eq(File.read(File.join(Rails.root, '../fixtures', '_header.html')))
 		end
 	end
-
 end

data/spec/views/pugin/people/list/lord/_lord.html.haml_spec.rb

@@ -0,0 +1,100 @@
+require 'spec_helper'
+require 'haml'
+
+describe 'pugin/people/list/member/_member.html.haml', type: :view do
+
+  context 'with a current lord data set' do
+
+    let(:current_lord_data_set) { Class.new }
+    let(:current_lord_seat_incumbency) { Class.new }
+    let(:current_lord_party) { Class.new }
+
+    before :each do
+
+      allow(current_lord_seat_incumbency).to receive(:current?).and_return(true)
+      allow(current_lord_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2018,1,23,4,5,6))
+
+      allow(current_lord_party).to receive(:name).and_return('Labour')
+
+      allow(current_lord_data_set).to receive(:parties).and_return([1,2,3])
+      allow(current_lord_data_set).to receive(:most_recent_seat_incumbency).and_return(current_lord_seat_incumbency)
+      allow(current_lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Member of the House of Lords']})
+      allow(current_lord_data_set).to receive(:current_party).and_return(current_lord_party)
+      allow(current_lord_data_set).to receive(:person_type).and_return('lord')
+      allow(current_lord_data_set).to receive(:graph_id).and_return('123')
+      allow(current_lord_data_set).to receive(:display_name).and_return('currentlord1')
+      allow(current_lord_data_set).to receive(:image_id).and_return('456')
+
+      @people = [current_lord_data_set]
+    end
+
+    it "renders the current lord data" do
+      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
+      expect(response).to include("<a href='/people/123'>currentlord1</a>")
+      expect(response).to include("<p>Member of the House of Lords</p>")
+      expect(response).to include("<p>Labour</p>")
+    end
+  end
+
+  context 'with a former lord data set' do
+
+    let(:former_lord_data_set) { Class.new }
+    let(:former_lord_seat_incumbency) { Class.new }
+
+    before :each do
+
+      allow(former_lord_seat_incumbency).to receive(:current?).and_return(false)
+      allow(former_lord_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2018,1,23,4,5,6))
+
+      allow(former_lord_data_set).to receive(:most_recent_seat_incumbency).and_return(former_lord_seat_incumbency)
+      allow(former_lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Former Member of the House of Lords']})
+      allow(former_lord_data_set).to receive(:person_type).and_return('lord')
+      allow(former_lord_data_set).to receive(:graph_id).and_return('123')
+      allow(former_lord_data_set).to receive(:display_name).and_return('formerlord1')
+      allow(former_lord_data_set).to receive(:image_id).and_return('456')
+
+      @people = [former_lord_data_set]
+    end
+
+    it "renders the former lord data" do
+      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
+      expect(response).to include("<a href='/people/123'>formerlord1</a>")
+      expect(response).to include("<p>Former Member of the House of Lords</p>")
+    end
+  end
+
+  context 'with a parliament lord data set' do
+
+    let(:parliament_lord_data_set) { Class.new }
+    let(:parliament_lord_seat_incumbency) { Class.new }
+    let(:parliament_lord_party) { Class.new }
+    let(:parliament_lord_party_memberships) { Class.new }
+    let(:parliament_lord_statuses) { Class.new }
+
+    before :each do
+      @parliament = [1,2,3]
+
+      allow(parliament_lord_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2018,1,23,4,5,6))
+
+      allow(parliament_lord_party).to receive(:name).and_return('Conservative')
+
+      allow(parliament_lord_data_set).to receive(:parties).and_return([parliament_lord_party])
+      allow(parliament_lord_data_set).to receive(:most_recent_seat_incumbency).and_return(parliament_lord_seat_incumbency)
+      allow(parliament_lord_data_set).to receive(:person_type).and_return('lord')
+      allow(parliament_lord_data_set).to receive(:graph_id).and_return('123')
+      allow(parliament_lord_data_set).to receive(:display_name).and_return('currentlord1')
+      allow(parliament_lord_data_set).to receive(:image_id).and_return('456')
+
+      @people = [parliament_lord_data_set]
+
+    end
+
+    it "renders the parliament lord data" do
+      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
+      expect(response).to include("<a href='/people/123'>currentlord1</a>")
+      expect(response).to include("<p>Member of the House of Lords</p>")
+      expect(response).to include("<p>Conservative</p>")
+    end
+
+  end
+end

data/spec/views/pugin/people/list/member/{_member.html.haml → _member.html.haml_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'haml'
 
-describe 'pugin/people/list/member/_member.html.haml', type: :view do 
+describe 'pugin/people/list/member/_member.html.haml', type: :view do
 
   context 'with a current MP data set' do
 
@@ -9,36 +9,32 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
     let(:current_mp_seat_incumbency) { Class.new }
     let(:current_mp_constituency) { Class.new }
     let(:current_mp_party) { Class.new }
-    let(:current_mp_party_memberships) { Class.new }
 
-    before :each do  
+    before :each do
       allow(current_mp_constituency).to receive(:name).and_return('constituency1')
 
-      allow(current_mp_seat_incumbency).to receive(:current?).and_return(true)
       allow(current_mp_seat_incumbency).to receive(:constituency).and_return(current_mp_constituency)
+      allow(current_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2018, 01, 22, 4, 5, 6))
 
       allow(current_mp_party).to receive(:name).and_return('Labour')
 
-      allow(current_mp_party_memberships).to receive(:current?).and_return(true)
-      allow(current_mp_party_memberships).to receive(:party).and_return(current_mp_party)
-
-      allow(current_mp_data_set).to receive(:house_incumbencies).and_return([])
-      allow(current_mp_data_set).to receive(:seat_incumbencies).and_return([current_mp_seat_incumbency])
-      allow(current_mp_data_set).to receive(:constituencies).and_return([current_mp_constituency])
-      allow(current_mp_data_set).to receive(:parties).and_return([1,2,3])
-      allow(current_mp_data_set).to receive(:party_memberships).and_return([current_mp_party_memberships])
-
+      allow(current_mp_data_set).to receive(:current_party).and_return(current_mp_party)
+      allow(current_mp_data_set).to receive(:most_recent_seat_incumbency).and_return(current_mp_seat_incumbency)
+      allow(current_mp_data_set).to receive(:current_seat_incumbency).and_return(current_mp_seat_incumbency)
+      allow(current_mp_data_set).to receive(:parties).and_return([current_mp_party])
+      allow(current_mp_data_set).to receive(:image_id).and_return('456')
+      allow(current_mp_data_set).to receive(:person_type).and_return('member')
       allow(current_mp_data_set).to receive(:graph_id).and_return('123')
       allow(current_mp_data_set).to receive(:display_name).and_return('currentmp1')
 
       @people = [current_mp_data_set]
     end
 
-    it "renders the current MP data" do 
+    it "renders the current MP data" do
       render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>currentmp1</a>") 
-      expect(response).to include("<p>MP for constituency1</p>") 
-      expect(response).to include("<p>Labour</p>") 
+      expect(response).to include("<a href='/people/123'>currentmp1</a>")
+      expect(response).to include("<p>MP for constituency1</p>")
+      expect(response).to include("<p>Labour</p>")
     end
   end
 
@@ -48,71 +44,69 @@ describe 'pugin/people/list/member/_member.html.haml', type: :view do
     let(:former_mp_seat_incumbency) { Class.new }
     let(:former_mp_constituency) { Class.new }
 
-    before :each do  
+    before :each do
 
       allow(former_mp_constituency).to receive(:name).and_return('constituency1')
 
       allow(former_mp_seat_incumbency).to receive(:current?).and_return(false)
-      allow(former_mp_seat_incumbency).to receive(:constituency).and_return(former_mp_constituency)
+      allow(former_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2018, 01, 22, 4, 5, 6))
 
-      allow(former_mp_data_set).to receive(:house_incumbencies).and_return([])
-      allow(former_mp_data_set).to receive(:seat_incumbencies).and_return([former_mp_seat_incumbency])
+      allow(former_mp_data_set).to receive(:most_recent_seat_incumbency).and_return(former_mp_seat_incumbency)
+      allow(former_mp_data_set).to receive(:current_seat_incumbency).and_return(nil)
       allow(former_mp_data_set).to receive(:graph_id).and_return('123')
       allow(former_mp_data_set).to receive(:display_name).and_return('formermp1')
-      allow(former_mp_data_set).to receive(:statuses).and_return({house_membership_status: ['Former MP']}) 
-
+      allow(former_mp_data_set).to receive(:statuses).and_return({house_membership_status: ['Former MP']})
+      allow(former_mp_data_set).to receive(:image_id).and_return('456')
+      allow(former_mp_data_set).to receive(:person_type).and_return('member')
 
       @people = [former_mp_data_set]
     end
 
-    it "renders the former MP data" do 
+    it "renders the former MP data" do
       render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>formermp1</a>") 
-      expect(response).to include("<p>Former MP</p>") 
+      expect(response).to include("<a href='/people/123'>formermp1</a>")
+      expect(response).to include("<p>Former MP</p>")
     end
   end
 
-  context 'with a parliament MP data set' do 
+  context 'with a parliament MP data set' do
 
     let(:parliament_mp_data_set) { Class.new }
     let(:parliament_mp_seat_incumbency) { Class.new }
     let(:parliament_mp_constituency) { Class.new }
     let(:parliament_mp_party) { Class.new }
-    let(:parliament_mp_party_memberships) { Class.new }
 
-    before :each do  
+    before :each do
       @parliament = [1,2,3]
 
       allow(parliament_mp_constituency).to receive(:name).and_return('constituency1')
 
-      allow(parliament_mp_seat_incumbency).to receive(:current?).and_return(true)
+      allow(parliament_mp_seat_incumbency).to receive(:current?).and_return(false)
       allow(parliament_mp_seat_incumbency).to receive(:start_date).and_return(DateTime.new(2017,2,3,4,5,6))
       allow(parliament_mp_seat_incumbency).to receive(:end_date).and_return(DateTime.new(2017,2,3,4,5,6))
       allow(parliament_mp_seat_incumbency).to receive(:constituency).and_return(parliament_mp_constituency)
 
-      allow(parliament_mp_party).to receive(:name).and_return('Labour')
-
-      allow(parliament_mp_party_memberships).to receive(:current?).and_return(true)
-      allow(parliament_mp_party_memberships).to receive(:party).and_return(parliament_mp_party)
-
-      allow(parliament_mp_data_set).to receive(:house_incumbencies).and_return([])
-      allow(parliament_mp_data_set).to receive(:seat_incumbencies).and_return([parliament_mp_seat_incumbency])
-      allow(parliament_mp_data_set).to receive(:constituencies).and_return([parliament_mp_constituency])
-      allow(parliament_mp_data_set).to receive(:parties).and_return([1,2,3])
-      allow(parliament_mp_data_set).to receive(:party_memberships).and_return([parliament_mp_party_memberships])
+      allow(parliament_mp_party).to receive(:name).and_return('Green Party')
 
+      allow(parliament_mp_data_set).to receive(:most_recent_seat_incumbency).and_return(parliament_mp_seat_incumbency)
+      allow(parliament_mp_data_set).to receive(:current_seat_incumbency).and_return(parliament_mp_seat_incumbency)
+      allow(parliament_mp_data_set).to receive(:parties).and_return([parliament_mp_party])
+      allow(parliament_mp_data_set).to receive(:person_type).and_return('member')
+      allow(parliament_mp_data_set).to receive(:image_id).and_return('456')
       allow(parliament_mp_data_set).to receive(:graph_id).and_return('123')
       allow(parliament_mp_data_set).to receive(:display_name).and_return('parliamentmp1')
 
       @people = [parliament_mp_data_set]
     end
 
-    it "renders the parliament MP data" do 
+    it "renders the parliament MP data" do
       render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
       expect(response).to include("<a href='/people/123'>parliamentmp1</a>")
-      expect(response).to include("<p>constituency1 from Fri, 03 Feb 2017 04:05:06 +0000 - Fri, 03 Feb 2017 04:05:06 +0000</p>") 
-      expect(response).to include("<p>Labour</p>") 
+      expect(response).to include("<p>
+constituency1 from Fri, 03 Feb 2017 04:05:06 +0000
+- Fri, 03 Feb 2017 04:05:06 +0000
+</p>")
+      expect(response).to include("<p>Green Party</p>")
     end
-
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pugin
 version: !ruby/object:Gem::Version
-  version: 1.6.10
+  version: 1.6.11
 platform: ruby
 authors:
 - Matt Rayner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -313,9 +313,8 @@ files:
 - spec/views/pugin/constituencies/list/_list.html.haml_spec.rb
 - spec/views/pugin/elements/_list.html.haml_spec.rb
 - spec/views/pugin/layouts/_layout.html.haml_spec.rb
-- spec/views/pugin/people/list/_list.html.haml
-- spec/views/pugin/people/list/lord/_lord.html.haml
-- spec/views/pugin/people/list/member/_member.html.haml
+- spec/views/pugin/people/list/lord/_lord.html.haml_spec.rb
+- spec/views/pugin/people/list/member/_member.html.haml_spec.rb
 homepage: https://github.com/ukparliament/pugin
 licenses:
 - Nonstandard
@@ -414,6 +413,5 @@ test_files:
 - spec/views/pugin/components/_footer.html.haml_spec.rb
 - spec/views/pugin/components/_navigation-main.html.haml_spec.rb
 - spec/views/pugin/elements/_list.html.haml_spec.rb
-- spec/views/pugin/people/list/_list.html.haml
-- spec/views/pugin/people/list/lord/_lord.html.haml
-- spec/views/pugin/people/list/member/_member.html.haml
+- spec/views/pugin/people/list/lord/_lord.html.haml_spec.rb
+- spec/views/pugin/people/list/member/_member.html.haml_spec.rb

data/spec/views/pugin/people/list/_list.html.haml

@@ -1,81 +0,0 @@
-require 'spec_helper'
-require 'haml'
-
-describe 'pugin/people/list/_list.html.haml', type: :view do 
-
-  context 'with a MP data set' do
-
-    let(:mp_data_set) { Class.new }
-    let(:mp_seat_incumbency) { Class.new }
-    let(:mp_constituency) { Class.new }
-    let(:mp_party) { Class.new }
-    let(:mp_party_memberships) { Class.new }
-
-    before :each do  
-      allow(mp_constituency).to receive(:name).and_return('constituency1')
-
-      allow(mp_seat_incumbency).to receive(:current?).and_return(true)
-      allow(mp_seat_incumbency).to receive(:constituency).and_return(mp_constituency)
-
-      allow(mp_party).to receive(:name).and_return('Labour')
-
-      allow(mp_party_memberships).to receive(:current?).and_return(true)
-      allow(mp_party_memberships).to receive(:party).and_return(mp_party)
-
-      allow(mp_data_set).to receive(:house_incumbencies).and_return([])
-      allow(mp_data_set).to receive(:seat_incumbencies).and_return([mp_seat_incumbency])
-      allow(mp_data_set).to receive(:constituencies).and_return([mp_constituency])
-      allow(mp_data_set).to receive(:parties).and_return([1,2,3])
-      allow(mp_data_set).to receive(:party_memberships).and_return([mp_party_memberships])
-
-      allow(mp_data_set).to receive(:graph_id).and_return('123')
-      allow(mp_data_set).to receive(:display_name).and_return('mp1')
-
-      @people = [mp_data_set]
-    end
-
-    it "renders the member partial" do 
-      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>mp1</a>") 
-      expect(response).to include("<p>Current MP for constituency1</p>") 
-      expect(response).to include("<p>Labour</p>") 
-    end
-  end
-
-  context 'with a Lord data set' do
-
-    let(:lord_data_set) { Class.new }
-    let(:lord_house_incumbency) { Class.new }
-    let(:lord_party) { Class.new }
-    let(:lord_party_memberships) { Class.new }
-    let(:lord_statuses) { Class.new }
-
-    before :each do  
-
-      allow(lord_house_incumbency).to receive(:current?).and_return(true)
-      allow(lord_house_incumbency).to receive(:start_date).and_return('123')
-
-      allow(lord_party).to receive(:name).and_return('Labour')
-
-      allow(lord_party_memberships).to receive(:current?).and_return(true)
-      allow(lord_party_memberships).to receive(:party).and_return(lord_party)
-
-      allow(lord_data_set).to receive(:parties).and_return([1,2,3])
-      allow(lord_data_set).to receive(:house_incumbencies).and_return([lord_house_incumbency])
-      allow(lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Member of the House of Lords']}) 
-      allow(lord_data_set).to receive(:party_memberships).and_return([lord_party_memberships])
-
-      allow(lord_data_set).to receive(:graph_id).and_return('123')
-      allow(lord_data_set).to receive(:display_name).and_return('lord1')
-
-      @people = [lord_data_set]
-    end
-
-    it "renders the lord partial" do 
-      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>lord1</a>") 
-      expect(response).to include("<p>Member of the House of Lords</p>") 
-      expect(response).to include("<p>Labour</p>") 
-    end
-  end
-end

data/spec/views/pugin/people/list/lord/_lord.html.haml

@@ -1,110 +0,0 @@
-require 'spec_helper'
-require 'haml'
-
-describe 'pugin/people/list/member/_member.html.haml', type: :view do 
-
-  context 'with a current lord data set' do
-
-    let(:current_lord_data_set) { Class.new }
-    let(:current_lord_house_incumbency) { Class.new }
-    let(:current_lord_party) { Class.new }
-    let(:current_lord_party_memberships) { Class.new }
-    let(:current_lord_statuses) { Class.new }
-
-    before :each do  
-
-      allow(current_lord_house_incumbency).to receive(:current?).and_return(true)
-      allow(current_lord_house_incumbency).to receive(:start_date).and_return('123')
-
-      allow(current_lord_party).to receive(:name).and_return('Labour')
-
-      allow(current_lord_party_memberships).to receive(:current?).and_return(true)
-      allow(current_lord_party_memberships).to receive(:party).and_return(current_lord_party)
-
-      allow(current_lord_data_set).to receive(:parties).and_return([1,2,3])
-      allow(current_lord_data_set).to receive(:house_incumbencies).and_return([current_lord_house_incumbency])
-      allow(current_lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Member of the House of Lords']}) 
-      allow(current_lord_data_set).to receive(:party_memberships).and_return([current_lord_party_memberships])
-
-      allow(current_lord_data_set).to receive(:graph_id).and_return('123')
-      allow(current_lord_data_set).to receive(:display_name).and_return('currentlord1')
-
-      @people = [current_lord_data_set]
-    end
-
-    it "renders the current lord data" do 
-      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>currentlord1</a>") 
-      expect(response).to include("<p>Member of the House of Lords</p>") 
-      expect(response).to include("<p>Labour</p>") 
-    end
-  end
-
-  context 'with a former lord data set' do
-
-    let(:former_lord_data_set) { Class.new }
-    let(:former_lord_house_incumbency) { Class.new }
-    let(:former_lord_party) { Class.new }
-    let(:former_lord_party_memberships) { Class.new }
-    let(:former_lord_statuses) { Class.new }
-
-    before :each do  
-
-      allow(former_lord_house_incumbency).to receive(:current?).and_return(false)
-      allow(former_lord_house_incumbency).to receive(:start_date).and_return('123')
-
-      allow(former_lord_data_set).to receive(:house_incumbencies).and_return([former_lord_house_incumbency])
-      allow(former_lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Former Member of the House of Lords']}) 
-      allow(former_lord_data_set).to receive(:party_memberships).and_return([former_lord_party_memberships])
-
-      allow(former_lord_data_set).to receive(:graph_id).and_return('123')
-      allow(former_lord_data_set).to receive(:display_name).and_return('formerlord1')
-
-      @people = [former_lord_data_set]
-    end
-
-    it "renders the former lord data" do 
-      render partial: "pugin/people/list/list", collection: @people, as: "people".to_sym
-      expect(response).to include("<a href='/people/123'>formerlord1</a>") 
-      expect(response).to include("<p>Former Member of the House of Lords</p>") 
-    end
-  end
-
-  context 'with a parliament lord data set' do 
-
-    let(:parliament_lord_data_set) { Class.new }
-    let(:parliament_lord_house_incumbency) { Class.new }
-    let(:parliament_lord_party) { Class.new }
-    let(:parliament_lord_party_memberships) { Class.new }
-    let(:parliament_lord_statuses) { Class.new }
-
-    before :each do 
-      @parliament = [1,2,3]
-
-      allow(parliament_lord_house_incumbency).to receive(:current?).and_return(true)
-      allow(parliament_lord_house_incumbency).to receive(:start_date).and_return('123')
-
-      allow(parliament_lord_party).to receive(:name).and_return('Labour')
-
-      allow(parliament_lord_party_memberships).to receive(:current?).and_return(true)
-      allow(parliament_lord_party_memberships).to receive(:party).and_return(parliament_lord_party)
-
-      allow(parliament_lord_data_set).to receive(:parties).and_return([1,2,3])
-      allow(parliament_lord_data_set).to receive(:house_incumbencies).and_return([parliament_lord_house_incumbency])
-      allow(parliament_lord_data_set).to receive(:statuses).and_return({house_membership_status: ['Member of the House of Lords']}) 
-      allow(parliament_lord_data_set).to receive(:party_memberships).and_return([parliament_lord_party_memberships])
-
-      allow(parliament_lord_data_set).to receive(:graph_id).and_return('123')
-      allow(parliament_lord_data_set).to receive(:display_name).and_return('currentlord1')
-
-      @people = [parliament_lord_data_set]
-
-    end
-
-    it "renders the parliament lord data" do 
-      pending("Lord parliament data set not finalised")
-      this_should_not_get_executed
-    end
-
-  end
-end