Merge branch 'master' into api-dev-PRs

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/dev_seeds.rb
	db/schema.rb

spec/lib/age_spec.rb

@@ -0,0 +1,58 @@
+require 'rails_helper'
+
+describe Age do
+  describe '.in_years' do
+    it "handles nils" do
+      expect(Age.in_years(nil)).to be_nil
+    end
+
+    it "calculates age correctly for common dates" do
+      d = Date.new(1980, 3, 13)
+      expect(Age.in_years(d, Date.new(2000, 3, 12))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000, 3, 13))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000, 3, 14))).to eq(20)
+    end
+
+    it "calculates age correctly for people born near a year's limit" do
+      d = Date.new(1980, 12, 31)
+      expect(Age.in_years(d, Date.new(2000, 12, 30))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000, 12, 31))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  1,  1))).to eq(20)
+
+      d = Date.new(1980, 1, 1)
+      expect(Age.in_years(d, Date.new(2000, 12, 31))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  1,  1))).to eq(21)
+      expect(Age.in_years(d, Date.new(2001,  1,  2))).to eq(21)
+    end
+
+    it "calculates age correctly for people born around February the 29th" do
+      # 1980 and 2000 are leap years. 2001 is a regular year
+      d = Date.new(1980, 2, 29)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+
+      d = Date.new(1980, 2, 28)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(20)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(21)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+
+      d = Date.new(1980, 3, 1)
+      expect(Age.in_years(d, Date.new(2000,  2, 27))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 28))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  2, 29))).to eq(19)
+      expect(Age.in_years(d, Date.new(2000,  3,  1))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 27))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  2, 28))).to eq(20)
+      expect(Age.in_years(d, Date.new(2001,  3,  1))).to eq(21)
+    end
+  end
+end

spec/lib/email_digests_spec.rb

@@ -122,6 +122,19 @@ describe EmailDigest do
       expect(notification3.emailed_at).to_not be
     end
 
+    it "resets the failed_email_digests_count flag" do
+      user1 = create(:user, failed_email_digests_count: 0)
+      user2 = create(:user, failed_email_digests_count: 3)
+
+      email_digest_1 = EmailDigest.new(user1)
+      email_digest_2 = EmailDigest.new(user2)
+      email_digest_1.mark_as_emailed
+      email_digest_2.mark_as_emailed
+
+      expect(user1.failed_email_digests_count).to eq(0)
+      expect(user2.failed_email_digests_count).to eq(0)
+    end
+
   end
 
 end

spec/lib/migrate_spending_proposals_to_investments_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
-describe SpendingProposalsImporter do
+describe MigrateSpendingProposalsToInvestments do
 
-  let(:importer) { SpendingProposalsImporter.new }
+  let(:importer) { MigrateSpendingProposalsToInvestments.new }
 
   describe '#import' do