Merge pull request #2214 from 18F/dev

dev --> master
18F · Jan 19, 2017 · 8acabe4 · 8acabe4
2 parents 05d9689 + abb095a
commit 8acabe4
Show file tree

Hide file tree

Showing 396 changed files with 2,777 additions and 2,773 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,4 @@ _team/jackie.md
 _team/alison.md
 _team/mbland.md
 /bin
+/coverage
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -11,6 +11,7 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'db/schema.rb'
+    - '_site/**/*'
   UseCache: true
 
 Metrics/AbcSize:

diff --git a/Accessibility Scanning Using Pa11y-ci.md b/Accessibility Scanning Using Pa11y-ci.md
diff --git a/Gemfile b/Gemfile
@@ -1,16 +1,16 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-ruby "2.3.1"
-gem "redcarpet"
-gem "jekyll", '~> 3.1'
-gem "html-proofer"
-gem "accesslint-ci", "0.2.6"
+ruby '2.3.1'
+gem 'redcarpet'
+gem 'jekyll', '~> 3.1'
+gem 'html-proofer'
+gem 'accesslint-ci', '0.2.6'
 
 group :jekyll_plugins do
   if ENV['FAST_BUILDS'] == 'true'
     puts 'not using jekyll-archives because its sloooooooooow'
   else
-    gem 'jekyll-archives', :git => 'https://github.com/18F/jekyll-archives.git'
+    gem 'jekyll-archives', git: 'https://github.com/18F/jekyll-archives.git'
   end
 
   gem 'jekyll_pages_api'
@@ -25,12 +25,17 @@ end
 gem 'jemoji'
 
 group :development do
-  gem "capybara"
-  gem "chromedriver-helper"
-  gem "colorize"
-  gem "pry"
-  gem "rack-jekyll"
+  gem 'capybara'
+  gem 'chromedriver-helper'
+  gem 'colorize'
+  gem 'pry'
+  gem 'rack-jekyll'
   gem 'rb-readline'
-  gem "rspec"
-  gem "selenium-webdriver"
+  gem 'rspec'
+  gem 'selenium-webdriver'
+end
+
+group :test do
+  gem 'simplecov'
+  gem 'codeclimate-test-reporter', '~> 1.0.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -32,11 +32,14 @@ GEM
     chromedriver-helper (1.0.0)
       archive-zip (~> 0.7.0)
       nokogiri (~> 1.6)
+    codeclimate-test-reporter (1.0.4)
+      simplecov
     coderay (1.1.1)
     colorator (1.1.0)
     colored (1.2)
     colorize (0.8.1)
     diff-lcs (1.2.5)
+    docile (1.1.5)
     domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     ethon (0.9.1)
@@ -158,6 +161,11 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
+    simplecov (0.12.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
     thor (0.19.4)
     thread_safe (0.3.5)
@@ -180,6 +188,7 @@ DEPENDENCIES
   accesslint-ci (= 0.2.6)
   capybara
   chromedriver-helper
+  codeclimate-test-reporter (~> 1.0.0)
   colorize
   html-proofer
   jekyll (~> 3.1)
@@ -199,9 +208,10 @@ DEPENDENCIES
   redcarpet
   rspec
   selenium-webdriver
+  simplecov
 
 RUBY VERSION
    ruby 2.3.1p112
 
 BUNDLED WITH
-   1.13.6
+   1.13.7
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Code Climate](https://codeclimate.com/github/18F/micropurchase/badges/gpa.svg)](https://codeclimate.com/github/18F/18f.gsa.gov)
+[![Code Climate](https://codeclimate.com/github/18F/18f.gsa.gov/badges/gpa.svg)](https://codeclimate.com/github/18F/18f.gsa.gov) [![Test Coverage](https://codeclimate.com/github/18F/18f.gsa.gov/badges/coverage.svg)](https://codeclimate.com/github/18F/18f.gsa.gov/coverage)
 
 # 18F’s flagship website
 

diff --git a/_authors/18F.md b/_authors/18F.md
@@ -8,7 +8,6 @@ city:
 state: 
 github: 18F
 twitter: 18F
-team: 18F
 redirect_from: "/team/18F/"
 published: true
 ---

diff --git a/_authors/aaron.md b/_authors/aaron.md
@@ -8,7 +8,6 @@ city: Washington
 state: D.C.
 github: 
 twitter: 
-team: 18F
 redirect_from: "/team/aaron/"
 alumni: true
 published: true

diff --git a/_authors/ada-lovelace.md b/_authors/ada-lovelace.md
@@ -6,7 +6,6 @@ name: ada-lovelace
 role: Developer
 city: London
 state: UK
-team: Engineering
 april-fools: 2016
 tags: april fools 2016
 redirect_to: "/april-fools/2016/"

diff --git a/_authors/adam-kendall.md b/_authors/adam-kendall.md
@@ -7,7 +7,6 @@ last_name: Kendall
 name: adam-kendall
 role: 
 state: VA
-team: Engineering
 twitter: 
 redirect_from: "/team/adam-kendall/"
 published: false

diff --git a/_authors/adrian-webb.md b/_authors/adrian-webb.md
@@ -7,7 +7,6 @@ last_name: Webb
 name: adrian-webb
 role: Technical Architect
 state: D.C.
-team: Consulting
 twitter: 
 redirect_from: "/team/adrian-webb/"
 published: false

diff --git a/_authors/afeld.md b/_authors/afeld.md
@@ -8,7 +8,6 @@ city: New York City
 state: NY
 github: 
 twitter: 
-team: Delivery
 redirect_from: "/team/afeld/"
 published: true
 ---

diff --git a/_authors/alan-atlas.md b/_authors/alan-atlas.md
@@ -7,7 +7,6 @@ last_name: Atlas
 name: alan-atlas
 role: 
 state: WA
-team: 
 twitter: 
 redirect_from: "/team/alan-atlas/"
 published: true

diff --git a/_authors/alan-brouilette.md b/_authors/alan-brouilette.md
@@ -7,7 +7,6 @@ last_name: Brouilette
 name: alan-brouilette
 role: Product Manager
 state: IL
-team: Product
 twitter: 
 redirect_from: "/team/alan-brouilette/"
 published: true

diff --git a/_authors/alan-turing.md b/_authors/alan-turing.md
@@ -6,7 +6,6 @@ name: alan-turing
 role: Testing Lead
 city: Bletchley Park
 state: UK
-team: Delivery
 april-fools: 2016
 redirect_to: "/april-fools/2016/"
 joke: |

diff --git a/_authors/alan.md b/_authors/alan.md
@@ -8,7 +8,6 @@ city: Washington
 state: D.C.
 github: 
 twitter: 
-team: Consulting
 redirect_from: "/team/alan/"
 published: true
 ---

diff --git a/_authors/alex-bisker.md b/_authors/alex-bisker.md
@@ -7,7 +7,6 @@ last_name: Bisker
 name: alex-bisker
 role: 
 state: New York
-team: Delivery
 twitter: 
 redirect_from: "/team/alex-bisker/"
 published: true

diff --git a/_authors/alex-pandel.md b/_authors/alex-pandel.md
@@ -7,7 +7,6 @@ last_name: Pandel
 name: alex-pandel
 role: 
 state: CA
-team: 
 twitter: 
 redirect_from: "/team/alex-pandel/"
 published: false

diff --git a/_authors/alexander-hamilton.md b/_authors/alexander-hamilton.md
@@ -6,7 +6,6 @@ name: alexander-hamilton
 role: Product Lead
 city: New York
 state: NY
-team: DevOps
 april-fools: 2016
 redirect_to: "/april-fools/2016/"
 joke: |

diff --git a/_authors/alison.md b/_authors/alison.md
@@ -8,7 +8,6 @@ city:
 state: 
 github: 
 twitter: 
-team: 
 redirect_from: 
 alumni: true
 published: true

diff --git a/_authors/alla.md b/_authors/alla.md
@@ -7,7 +7,6 @@ last_name: Seiffert
 name: alla
 role: Deputy for Acquisition
 state: DC
-team: Acquisition
 twitter: 
 redirect_from: "/team/alla/"
 published: true

diff --git a/_authors/amanda-robinson.md b/_authors/amanda-robinson.md
@@ -7,7 +7,6 @@ last_name: Robinson
 name: amanda-robinson
 role: Developer
 state: DC
-team: Delivery
 twitter: aertzeid
 redirect_from: "/team/amanda-robinson/"
 published: false

diff --git a/_authors/amanda-schonfeld.md b/_authors/amanda-schonfeld.md
@@ -7,7 +7,6 @@ last_name: Schonfeld
 name: amanda-schonfeld
 role: 
 state: IL
-team: 
 twitter: 
 redirect_from: "/team/amanda-schonfeld/"
 published: false

diff --git a/_authors/amber.md b/_authors/amber.md
@@ -7,7 +7,6 @@ last_name: Reed
 name: amber
 role: 
 state: 
-team: 
 twitter: 
 redirect_from: "/team/amber/"
 published: false

diff --git a/_authors/amos.md b/_authors/amos.md
@@ -8,7 +8,6 @@ city: San Francisco
 state: CA
 github: 
 twitter: 
-team: Delivery
 redirect_from: "/team/amos/"
 published: true
 ---