RubyGems - popolo - Versions diffs - 0.0.3 → 0.1.0 - Mend

popolo 0.0.3 → 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (74) hide show

checksums.yaml +4 -4
data/README.md +6 -2
data/Rakefile +13 -4
data/app/models/popolo/area.rb +3 -3
data/app/models/popolo/contact_detail.rb +4 -0
data/app/models/popolo/motion.rb +3 -1
data/app/models/popolo/organization.rb +8 -4
data/app/models/popolo/other_name.rb +12 -0
data/app/models/popolo/person.rb +3 -3
data/app/models/popolo/post.rb +2 -0
data/app/models/popolo/vote_event.rb +1 -1
data/lib/popolo/version.rb +1 -1
data/spec/controllers/popolo/memberships_controller_spec.rb +13 -11
data/spec/controllers/popolo/organizations_controller_spec.rb +18 -17
data/spec/controllers/popolo/people_controller_spec.rb +13 -11
data/spec/controllers/popolo/posts_controller_spec.rb +13 -11
data/spec/dummy/README.rdoc +28 -0
data/spec/dummy/Rakefile +1 -2
data/spec/dummy/app/assets/javascripts/application.js +3 -3
data/spec/dummy/app/assets/stylesheets/application.css +5 -4
data/spec/dummy/app/controllers/application_controller.rb +3 -1
data/spec/dummy/app/views/layouts/application.html.erb +2 -4
data/spec/dummy/bin/bundle +3 -0
data/spec/dummy/bin/rails +4 -0
data/spec/dummy/bin/rake +4 -0
data/spec/dummy/config/application.rb +1 -38
data/spec/dummy/config/boot.rb +4 -9
data/spec/dummy/config/environment.rb +3 -3
data/spec/dummy/config/environments/development.rb +19 -19
data/spec/dummy/config/environments/production.rb +44 -28
data/spec/dummy/config/environments/test.rb +17 -15
data/spec/dummy/config/initializers/backtrace_silencers.rb +7 -0
data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
data/spec/dummy/config/initializers/inflections.rb +16 -0
data/spec/dummy/config/initializers/mime_types.rb +4 -0
data/spec/dummy/config/initializers/session_store.rb +1 -6
data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
data/spec/dummy/config/locales/en.yml +20 -2
data/spec/dummy/config/mongoid.yml +21 -20
data/spec/dummy/config/secrets.yml +22 -0
data/spec/dummy/config.ru +1 -1
data/spec/dummy/log/development.log +0 -0
data/spec/dummy/log/test.log +4423 -0
data/spec/dummy/public/404.html +54 -13
data/spec/dummy/public/422.html +54 -13
data/spec/dummy/public/500.html +53 -12
data/spec/helpers/popolo_helper_spec.rb +2 -2
data/spec/models/popolo/area_spec.rb +4 -2
data/spec/models/popolo/contact_detail_spec.rb +6 -4
data/spec/models/popolo/count_spec.rb +6 -4
data/spec/models/popolo/date_string_spec.rb +92 -90
data/spec/models/popolo/group_result_spec.rb +6 -4
data/spec/models/popolo/identifier_spec.rb +5 -3
data/spec/models/popolo/link_spec.rb +5 -3
data/spec/models/popolo/membership_spec.rb +9 -7
data/spec/models/popolo/motion_spec.rb +5 -3
data/spec/models/popolo/organization_spec.rb +6 -4
data/spec/models/popolo/other_name_spec.rb +7 -5
data/spec/models/popolo/person_spec.rb +22 -20
data/spec/models/popolo/post_spec.rb +5 -3
data/spec/models/popolo/vote_event_spec.rb +4 -2
data/spec/models/popolo/vote_spec.rb +4 -2
data/spec/popolo_spec.rb +15 -15
data/spec/rails_helper.rb +68 -0
data/spec/routing/popolo/memberships_routing_spec.rb +8 -6
data/spec/routing/popolo/organizations_routing_spec.rb +11 -9
data/spec/routing/popolo/people_routing_spec.rb +8 -6
data/spec/routing/popolo/posts_routing_spec.rb +8 -6
data/spec/spec_helper.rb +70 -80
data/spec/support/{shared_examples.rb → shared_examples/date.rb} +1 -1
metadata +52 -89
data/spec/controllers/popolo_controller_spec.rb +0 -4
data/spec/dummy/config/initializers/secret_token.rb +0 -7

data/spec/dummy/public/404.html CHANGED Viewed

@@ -2,25 +2,66 @@
 <html>
 <head>
   <title>The page you were looking for doesn't exist (404)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
   <!-- This file lives in public/404.html -->
   <div class="dialog">
-    <h1>The page you were looking for doesn't exist.</h1>
-    <p>You may have mistyped the address or the page may have moved.</p>
+    <div>
+      <h1>The page you were looking for doesn't exist.</h1>
+      <p>You may have mistyped the address or the page may have moved.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
 </body>
 </html>

data/spec/dummy/public/422.html CHANGED Viewed

@@ -2,25 +2,66 @@
 <html>
 <head>
   <title>The change you wanted was rejected (422)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>The change you wanted was rejected.</h1>
-    <p>Maybe you tried to change something you didn't have access to.</p>
+    <div>
+      <h1>The change you wanted was rejected.</h1>
+      <p>Maybe you tried to change something you didn't have access to.</p>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
 </body>
 </html>

data/spec/dummy/public/500.html CHANGED Viewed

@@ -2,24 +2,65 @@
 <html>
 <head>
   <title>We're sorry, but something went wrong (500)</title>
-  <style type="text/css">
-    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
-    div.dialog {
-      width: 25em;
-      padding: 0 4em;
-      margin: 4em auto 0 auto;
-      border: 1px solid #ccc;
-      border-right-color: #999;
-      border-bottom-color: #999;
-    }
-    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <style>
+  body {
+    background-color: #EFEFEF;
+    color: #2E2F30;
+    text-align: center;
+    font-family: arial, sans-serif;
+    margin: 0;
+  }
+  div.dialog {
+    width: 95%;
+    max-width: 33em;
+    margin: 4em auto 0;
+  }
+  div.dialog > div {
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #BBB;
+    border-top: #B00100 solid 4px;
+    border-top-left-radius: 9px;
+    border-top-right-radius: 9px;
+    background-color: white;
+    padding: 7px 12% 0;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
+  h1 {
+    font-size: 100%;
+    color: #730E15;
+    line-height: 1.5em;
+  }
+  div.dialog > p {
+    margin: 0 0 1em;
+    padding: 1em;
+    background-color: #F7F7F7;
+    border: 1px solid #CCC;
+    border-right-color: #999;
+    border-left-color: #999;
+    border-bottom-color: #999;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top-color: #DADADA;
+    color: #666;
+    box-shadow: 0 3px 8px rgba(50, 50, 50, 0.17);
+  }
   </style>
 </head>
 <body>
   <!-- This file lives in public/500.html -->
   <div class="dialog">
-    <h1>We're sorry, but something went wrong.</h1>
+    <div>
+      <h1>We're sorry, but something went wrong.</h1>
+    </div>
+    <p>If you are the application owner check the logs for more information.</p>
   </div>
 </body>
 </html>

data/spec/helpers/popolo_helper_spec.rb CHANGED Viewed

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
-describe PopoloHelper do
+RSpec.describe PopoloHelper do
 end

data/spec/models/popolo/area_spec.rb CHANGED Viewed

@@ -1,4 +1,6 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Area do
+module Popolo
+  RSpec.describe Area do
+  end
 end

data/spec/models/popolo/contact_detail_spec.rb CHANGED Viewed

@@ -1,7 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::ContactDetail do
-  [:type, :value].each do |attribute|
-    it {should validate_presence_of attribute}
+module Popolo
+  RSpec.describe ContactDetail do
+    [:type, :value].each do |attribute|
+      it {should validate_presence_of attribute}
+    end
   end
 end

data/spec/models/popolo/count_spec.rb CHANGED Viewed

@@ -1,7 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Count do
-  [:option, :value].each do |attribute|
-    it {should validate_presence_of attribute}
+module Popolo
+  RSpec.describe Count do
+    [:option, :value].each do |attribute|
+      it {should validate_presence_of attribute}
+    end
   end
 end

data/spec/models/popolo/date_string_spec.rb CHANGED Viewed

@@ -1,121 +1,123 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::DateString do
-  let :date do
-    Date.new(2011, 2, 3)
-  end
-  let :date_string_year_month_day do
-    Popolo::DateString.new('2011-02-03')
-  end
-  let :date_string_year_month do
-    Popolo::DateString.new('2011-02')
-  end
-  let :date_string_year do
-    Popolo::DateString.new('2011')
-  end
-  let :date_string_empty do
-    Popolo::DateString.new('')
-  end
-  let :year_month_day do
-    '2011-02-03'
-  end
-  let :year_month do
-    '2011-02'
-  end
-  let :year do
-    '2011'
-  end
-  let :empty do
-    ''
-  end
-  describe '#mongoize' do
-    it 'returns a string' do
-      date_string_year_month_day.mongoize.should == year_month_day
+module Popolo
+  RSpec.describe DateString do
+    let :date do
+      Date.new(2011, 2, 3)
     end
-    it 'returns a string if day truncated' do
-      date_string_year_month.mongoize.should == year_month
+    let :date_string_year_month_day do
+      Popolo::DateString.new('2011-02-03')
     end
-    it 'returns a string if month and day truncated' do
-      date_string_year.mongoize.should == year
+    let :date_string_year_month do
+      Popolo::DateString.new('2011-02')
     end
-    it 'returns nil if empty string' do
-      date_string_empty.mongoize.should == nil
+    let :date_string_year do
+      Popolo::DateString.new('2011')
     end
-  end
-  describe '.demongoize' do
-    it 'returns a date' do
-      Popolo::DateString.demongoize(year_month_day).mongoize.should == date
+    let :date_string_empty do
+      Popolo::DateString.new('')
     end
-    it 'returns a string if day truncated' do
-      Popolo::DateString.demongoize(year_month).mongoize.should == year_month
+    let :year_month_day do
+      '2011-02-03'
     end
-    it 'returns a string if month and day truncated' do
-      Popolo::DateString.demongoize(year).mongoize.should == year
+    let :year_month do
+      '2011-02'
     end
-    it 'returns nil if empty string' do
-      Popolo::DateString.demongoize(empty).mongoize.should == nil
+    let :year do
+      '2011'
     end
-  end
-  describe '.mongoize' do
-    it 'returns a string when given a date' do
-      Popolo::DateString.mongoize(date).should == year_month_day
+    let :empty do
+      ''
     end
-    it 'returns a string when given a date string' do
-      Popolo::DateString.mongoize(date_string_year_month_day).should == year_month_day
-      Popolo::DateString.mongoize(date_string_year_month).should == year_month
-      Popolo::DateString.mongoize(date_string_year).should == year
-    end
+    describe '#mongoize' do
+      it 'returns a string' do
+        expect(date_string_year_month_day.mongoize).to eq(year_month_day)
+      end
-    it 'returns a string when given a string' do
-      Popolo::DateString.mongoize(year_month_day).should == year_month_day
-      Popolo::DateString.mongoize(year_month).should == year_month
-      Popolo::DateString.mongoize(year).should == year
-    end
+      it 'returns a string if day truncated' do
+        expect(date_string_year_month.mongoize).to eq(year_month)
+      end
-    it 'returns nil when given an empty string' do
-      Popolo::DateString.mongoize(date_string_empty).should == nil
-      Popolo::DateString.mongoize(empty).should == nil
-    end
-  end
+      it 'returns a string if month and day truncated' do
+        expect(date_string_year.mongoize).to eq(year)
+      end
-  describe '.evolve' do
-    it 'returns a string when given a date' do
-      Popolo::DateString.evolve(date).should == year_month_day
+      it 'returns nil if empty string' do
+        expect(date_string_empty.mongoize).to eq(nil)
+      end
     end
-    it 'returns a string when given a date string' do
-      Popolo::DateString.evolve(date_string_year_month_day).should == year_month_day
-      Popolo::DateString.evolve(date_string_year_month).should == year_month
-      Popolo::DateString.evolve(date_string_year).should == year
+    describe '.demongoize' do
+      it 'returns a date' do
+        expect(Popolo::DateString.demongoize(year_month_day).mongoize).to eq(date)
+      end
+      it 'returns a string if day truncated' do
+        expect(Popolo::DateString.demongoize(year_month).mongoize).to eq(year_month)
+      end
+      it 'returns a string if month and day truncated' do
+        expect(Popolo::DateString.demongoize(year).mongoize).to eq(year)
+      end
+      it 'returns nil if empty string' do
+        expect(Popolo::DateString.demongoize(empty).mongoize).to eq(nil)
+      end
     end
-    it 'returns a string when given a string' do
-      Popolo::DateString.evolve(year_month_day).should == year_month_day
-      Popolo::DateString.evolve(year_month).should == year_month
-      Popolo::DateString.evolve(year).should == year
+    describe '.mongoize' do
+      it 'returns a string when given a date' do
+        expect(Popolo::DateString.mongoize(date)).to eq(year_month_day)
+      end
+      it 'returns a string when given a date string' do
+        expect(Popolo::DateString.mongoize(date_string_year_month_day)).to eq(year_month_day)
+        expect(Popolo::DateString.mongoize(date_string_year_month)).to eq(year_month)
+        expect(Popolo::DateString.mongoize(date_string_year)).to eq(year)
+      end
+      it 'returns a string when given a string' do
+        expect(Popolo::DateString.mongoize(year_month_day)).to eq(year_month_day)
+        expect(Popolo::DateString.mongoize(year_month)).to eq(year_month)
+        expect(Popolo::DateString.mongoize(year)).to eq(year)
+      end
+      it 'returns nil when given an empty string' do
+        expect(Popolo::DateString.mongoize(date_string_empty)).to eq(nil)
+        expect(Popolo::DateString.mongoize(empty)).to eq(nil)
+      end
     end
-    it 'returns nil when given an empty string' do
-      Popolo::DateString.evolve(date_string_empty).should == nil
-      Popolo::DateString.evolve(empty).should == nil
+    describe '.evolve' do
+      it 'returns a string when given a date' do
+        expect(Popolo::DateString.evolve(date)).to eq(year_month_day)
+      end
+      it 'returns a string when given a date string' do
+        expect(Popolo::DateString.evolve(date_string_year_month_day)).to eq(year_month_day)
+        expect(Popolo::DateString.evolve(date_string_year_month)).to eq(year_month)
+        expect(Popolo::DateString.evolve(date_string_year)).to eq(year)
+      end
+      it 'returns a string when given a string' do
+        expect(Popolo::DateString.evolve(year_month_day)).to eq(year_month_day)
+        expect(Popolo::DateString.evolve(year_month)).to eq(year_month)
+        expect(Popolo::DateString.evolve(year)).to eq(year)
+      end
+      it 'returns nil when given an empty string' do
+        expect(Popolo::DateString.evolve(date_string_empty)).to eq(nil)
+        expect(Popolo::DateString.evolve(empty)).to eq(nil)
+      end
     end
   end
 end

data/spec/models/popolo/group_result_spec.rb CHANGED Viewed

@@ -1,7 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::GroupResult do
-  [:group, :result].each do |attribute|
-    it {should validate_presence_of attribute}
+module Popolo
+  RSpec.describe GroupResult do
+    [:group, :result].each do |attribute|
+      it {should validate_presence_of attribute}
+    end
   end
 end

data/spec/models/popolo/identifier_spec.rb CHANGED Viewed

@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Identifier do
-  it {should validate_presence_of :identifier}
+module Popolo
+  RSpec.describe Identifier do
+    it {should validate_presence_of :identifier}
+  end
 end

data/spec/models/popolo/link_spec.rb CHANGED Viewed

@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Link do
-  it {should validate_presence_of :url}
+module Popolo
+  RSpec.describe Link do
+    it {should validate_presence_of :url}
+  end
 end

data/spec/models/popolo/membership_spec.rb CHANGED Viewed

@@ -1,11 +1,13 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Membership do
-  [:organization_id, :person_id].each do |attribute|
-    it {should validate_presence_of attribute}
-  end
+module Popolo
+  RSpec.describe Membership do
+    [:organization_id, :person_id].each do |attribute|
+      it {should validate_presence_of attribute}
+    end
-  [:start_date, :end_date].each do |attribute|
-    it_should_behave_like 'a model with a date attribute', attribute
+    [:start_date, :end_date].each do |attribute|
+      it_behaves_like 'a model with a date attribute', attribute
+    end
   end
 end

data/spec/models/popolo/motion_spec.rb CHANGED Viewed

@@ -1,5 +1,7 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Motion do
-  it_should_behave_like 'a model with a date attribute', :date
+module Popolo
+  RSpec.describe Motion do
+    it_behaves_like 'a model with a date attribute', :date
+  end
 end

data/spec/models/popolo/organization_spec.rb CHANGED Viewed

@@ -1,7 +1,9 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Organization do
-  [:founding_date, :dissolution_date].each do |attribute|
-    it_should_behave_like 'a model with a date attribute', attribute
+module Popolo
+  RSpec.describe Organization do
+    [:founding_date, :dissolution_date].each do |attribute|
+      it_behaves_like 'a model with a date attribute', attribute
+    end
   end
 end

data/spec/models/popolo/other_name_spec.rb CHANGED Viewed

@@ -1,9 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::OtherName do
-  it {should validate_presence_of :name}
+module Popolo
+  RSpec.describe OtherName do
+    it {should validate_presence_of :name}
-  [:start_date, :end_date].each do |attribute|
-    it_should_behave_like 'a model with a date attribute', attribute
+    [:start_date, :end_date].each do |attribute|
+      it_behaves_like 'a model with a date attribute', attribute
+    end
   end
 end

data/spec/models/popolo/person_spec.rb CHANGED Viewed

@@ -1,29 +1,31 @@
-require 'spec_helper'
+require 'rails_helper'
-describe Popolo::Person do
-  [:birth_date, :death_date].each do |attribute|
-    it_should_behave_like 'a model with a date attribute', attribute
-  end
-  describe '#to_s' do
-    it 'should return the name if the name, given name and family name are blank' do
-      FactoryGirl.build(:person, name: nil).to_s.should == nil
+module Popolo
+  RSpec.describe Person do
+    [:birth_date, :death_date].each do |attribute|
+      it_behaves_like 'a model with a date attribute', attribute
     end
-    it 'should return the given name and family name if the name is blank' do
-      FactoryGirl.build(:person, name: nil, given_name: 'John', family_name: 'Public').to_s.should == 'John Public'
-    end
+    describe '#to_s' do
+      it 'should return the name if the name, given name and family name are blank' do
+        expect(FactoryGirl.build(:person, name: nil).to_s).to eq(nil)
+      end
-    it 'should return the family name if the name and given name are blank' do
-      FactoryGirl.build(:person, name: nil, family_name: 'Public').to_s.should == 'Public'
-    end
+      it 'should return the given name and family name if the name is blank' do
+        expect(FactoryGirl.build(:person, name: nil, given_name: 'John', family_name: 'Public').to_s).to eq('John Public')
+      end
-    it 'should return the given name if the name and family name are blank' do
-      FactoryGirl.build(:person, name: nil, given_name: 'John').to_s.should == 'John'
-    end
+      it 'should return the family name if the name and given name are blank' do
+        expect(FactoryGirl.build(:person, name: nil, family_name: 'Public').to_s).to eq('Public')
+      end
+      it 'should return the given name if the name and family name are blank' do
+        expect(FactoryGirl.build(:person, name: nil, given_name: 'John').to_s).to eq('John')
+      end
-    it 'should return the name if present' do
-      FactoryGirl.build(:person, given_name: 'John', family_name: 'Public').to_s.should == 'John Q. Public'
+      it 'should return the name if present' do
+        expect(FactoryGirl.build(:person, given_name: 'John', family_name: 'Public').to_s).to eq('John Q. Public')
+      end
     end
   end
 end