Skip to content

Commit 8acabe4

Browse files
author
Corey Mahoney
authored
Merge pull request #2214 from 18F/dev
dev --> master
2 parents 05d9689 + abb095a commit 8acabe4

File tree

396 files changed

+2777
-2773
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+2777
-2773
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ _team/jackie.md
2424
_team/alison.md
2525
_team/mbland.md
2626
/bin
27+
/coverage

.rubocop.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ AllCops:
1111
Exclude:
1212
- 'bin/**/*'
1313
- 'db/schema.rb'
14+
- '_site/**/*'
1415
UseCache: true
1516

1617
Metrics/AbcSize:

Accessibility Scanning Using Pa11y-ci.md

Lines changed: 0 additions & 131 deletions
This file was deleted.

Gemfile

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
source "https://rubygems.org"
1+
source 'https://rubygems.org'
22

3-
ruby "2.3.1"
4-
gem "redcarpet"
5-
gem "jekyll", '~> 3.1'
6-
gem "html-proofer"
7-
gem "accesslint-ci", "0.2.6"
3+
ruby '2.3.1'
4+
gem 'redcarpet'
5+
gem 'jekyll', '~> 3.1'
6+
gem 'html-proofer'
7+
gem 'accesslint-ci', '0.2.6'
88

99
group :jekyll_plugins do
1010
if ENV['FAST_BUILDS'] == 'true'
1111
puts 'not using jekyll-archives because its sloooooooooow'
1212
else
13-
gem 'jekyll-archives', :git => 'https://github.com/18F/jekyll-archives.git'
13+
gem 'jekyll-archives', git: 'https://github.com/18F/jekyll-archives.git'
1414
end
1515

1616
gem 'jekyll_pages_api'
@@ -25,12 +25,17 @@ end
2525
gem 'jemoji'
2626

2727
group :development do
28-
gem "capybara"
29-
gem "chromedriver-helper"
30-
gem "colorize"
31-
gem "pry"
32-
gem "rack-jekyll"
28+
gem 'capybara'
29+
gem 'chromedriver-helper'
30+
gem 'colorize'
31+
gem 'pry'
32+
gem 'rack-jekyll'
3333
gem 'rb-readline'
34-
gem "rspec"
35-
gem "selenium-webdriver"
34+
gem 'rspec'
35+
gem 'selenium-webdriver'
36+
end
37+
38+
group :test do
39+
gem 'simplecov'
40+
gem 'codeclimate-test-reporter', '~> 1.0.0'
3641
end

Gemfile.lock

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,14 @@ GEM
3232
chromedriver-helper (1.0.0)
3333
archive-zip (~> 0.7.0)
3434
nokogiri (~> 1.6)
35+
codeclimate-test-reporter (1.0.4)
36+
simplecov
3537
coderay (1.1.1)
3638
colorator (1.1.0)
3739
colored (1.2)
3840
colorize (0.8.1)
3941
diff-lcs (1.2.5)
42+
docile (1.1.5)
4043
domain_name (0.5.20161129)
4144
unf (>= 0.0.5, < 1.0.0)
4245
ethon (0.9.1)
@@ -158,6 +161,11 @@ GEM
158161
childprocess (~> 0.5)
159162
rubyzip (~> 1.0)
160163
websocket (~> 1.0)
164+
simplecov (0.12.0)
165+
docile (~> 1.1.0)
166+
json (>= 1.8, < 3)
167+
simplecov-html (~> 0.10.0)
168+
simplecov-html (0.10.0)
161169
slop (3.6.0)
162170
thor (0.19.4)
163171
thread_safe (0.3.5)
@@ -180,6 +188,7 @@ DEPENDENCIES
180188
accesslint-ci (= 0.2.6)
181189
capybara
182190
chromedriver-helper
191+
codeclimate-test-reporter (~> 1.0.0)
183192
colorize
184193
html-proofer
185194
jekyll (~> 3.1)
@@ -199,9 +208,10 @@ DEPENDENCIES
199208
redcarpet
200209
rspec
201210
selenium-webdriver
211+
simplecov
202212

203213
RUBY VERSION
204214
ruby 2.3.1p112
205215

206216
BUNDLED WITH
207-
1.13.6
217+
1.13.7

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Code Climate](https://codeclimate.com/github/18F/micropurchase/badges/gpa.svg)](https://codeclimate.com/github/18F/18f.gsa.gov)
1+
[![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)
22

33
# 18F’s flagship website
44

_authors/18F.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ city:
88
state:
99
github: 18F
1010
twitter: 18F
11-
team: 18F
1211
redirect_from: "/team/18F/"
1312
published: true
1413
---

_authors/aaron.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ city: Washington
88
state: D.C.
99
github:
1010
twitter:
11-
team: 18F
1211
redirect_from: "/team/aaron/"
1312
alumni: true
1413
published: true

_authors/ada-lovelace.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ name: ada-lovelace
66
role: Developer
77
city: London
88
state: UK
9-
team: Engineering
109
april-fools: 2016
1110
tags: april fools 2016
1211
redirect_to: "/april-fools/2016/"

_authors/adam-kendall.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ last_name: Kendall
77
name: adam-kendall
88
role:
99
state: VA
10-
team: Engineering
1110
twitter:
1211
redirect_from: "/team/adam-kendall/"
1312
published: false

0 commit comments

Comments
 (0)