Merge fd1dc7d into 1225c22

codeforamerica · Jun 30, 2018 · 0f7624c · 0f7624c
2 parents 1225c22 + fd1dc7d
commit 0f7624c
Show file tree

Hide file tree

Showing 13 changed files with 230 additions and 162 deletions.
diff --git a/.reek.yml b/.reek.yml
@@ -0,0 +1,29 @@
+detectors:
+  IrresponsibleModule:
+    enabled: false
+  UncommunicativeVariableName:
+    exclude:
+      - SchedulesHelper#regular_hours_for
+  UtilityFunction:
+    exclude:
+      - AddressFormatHelper
+      - ApplicationHelper
+      - DetailFormatHelper
+      - HomepageLinksHelper
+      - InfoBoxHelper
+      - KeywordTranslator#api_key
+      - MailtoHelper
+      - PaginationHelper
+      - PhoneFormatHelper
+      - StatusController#fetch_location_okay?
+      - StatusController#search_okay?
+directories:
+  'spec':
+    DuplicateMethodCall:
+      exclude:
+        - looks_like_no_results
+        - looks_like_results
+    UtilityFunction:
+      enabled: false
+exclude_paths:
+  - node_modules
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -212,7 +212,18 @@ Style/TrailingCommaInArguments:
     - consistent_comma
     - no_comma
 
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  # If `comma`, the cop requires a comma after the last item in an array or
+  # hash, but only when each item is on its own line.
+  # If `consistent_comma`, the cop requires a comma after the last item of all
+  # non-empty array and hash literals.
+  EnforcedStyleForMultiline: no_comma
+  SupportedStylesForMultiline:
+    - comma
+    - consistent_comma
+    - no_comma
+
+Style/TrailingCommaInHashLiteral:
   # If `comma`, the cop requires a comma after the last item in an array or
   # hash, but only when each item is on its own line.
   # If `consistent_comma`, the cop requires a comma after the last item of all

diff --git a/Gemfile b/Gemfile
@@ -46,15 +46,15 @@ group :development do
 end
 
 group :test do
-  gem 'capybara', '~> 2.4'
+  gem 'capybara'
   gem 'coveralls', require: false
   gem 'email_spec'
   gem 'haml_lint'
   gem 'poltergeist'
   gem 'rails-controller-testing'
   gem 'rubocop'
   gem 'vcr'
-  gem 'webmock', '~> 2.1'
+  gem 'webmock'
 end
 
 group :development, :test do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -35,25 +35,25 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    benchmark-ips (2.5.0)
+    benchmark-ips (2.7.2)
     better_errors (2.4.0)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.3)
-    bummr (0.2.1)
+    bummr (0.3.2)
       rainbow
       thor
-    capybara (2.18.0)
+    capybara (3.3.1)
       addressable
       mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    chunky_png (1.3.5)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.1)
+    chunky_png (1.3.10)
     cliver (0.3.2)
     codeclimate-engine-rb (0.4.1)
       virtus (~> 1.0)
@@ -72,60 +72,60 @@ GEM
       sass (>= 3.3.0, < 3.5)
     compass-import-once (1.0.5)
       sass (>= 3.2, < 3.5)
-    compass-rails (3.0.2)
+    compass-rails (3.1.0)
       compass (~> 1.0.0)
       sass-rails (< 5.1)
       sprockets (< 4.0)
     concurrent-ruby (1.0.5)
-    coveralls (0.8.21)
+    coveralls (0.8.22)
       json (>= 1.8, < 3)
-      simplecov (~> 0.14.1)
+      simplecov (~> 0.16.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.4)
       tins (~> 1.6)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
-    dalli (2.7.7)
+    crass (1.0.4)
+    dalli (2.7.8)
     debug_inspector (0.0.3)
     declarative (0.0.10)
     declarative-option (0.1.0)
     derailed (0.1.0)
       derailed_benchmarks
-    derailed_benchmarks (1.3.0)
+    derailed_benchmarks (1.3.4)
       benchmark-ips (~> 2)
       get_process_mem (~> 0)
       heapy (~> 0)
       memory_profiler (~> 0)
       rack (>= 1)
-      rake (~> 10)
+      rake (> 10, < 13)
       thor (~> 0.19)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.1.5)
-    email_spec (2.1.1)
+    docile (1.3.1)
+    email_spec (2.2.0)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
-      mail (~> 2.6)
+      mail (~> 2.7)
     equalizer (0.0.11)
     erubi (1.7.1)
     erubis (2.7.0)
     execjs (2.7.0)
-    faraday (0.14.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.14)
+    ffi (1.9.25)
     figaro (1.1.1)
       thor (~> 0.14)
     flamegraph (0.9.5)
-    font-awesome-rails (4.7.0.3)
-      railties (>= 3.2, < 5.2)
-    get_process_mem (0.2.0)
+    font-awesome-rails (4.7.0.4)
+      railties (>= 3.2, < 6.0)
+    get_process_mem (0.2.2)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    google-api-client (0.20.0)
+    google-api-client (0.23.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.5, < 0.7.0)
       httpclient (>= 2.8.1, < 3.0)
@@ -149,31 +149,33 @@ GEM
       haml (>= 4.0.6, < 6.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    haml_lint (0.27.0)
+    haml_lint (0.28.0)
       haml (>= 4.0, < 5.1)
       rainbow
       rake (>= 10, < 13)
       rubocop (>= 0.50.0)
       sysexits (~> 1.1)
-    hashdiff (0.3.2)
-    heapy (0.1.2)
+    hashdiff (0.3.7)
+    heapy (0.1.3)
     html2haml (2.2.0)
       erubis (~> 2.7.0)
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
     htmlentities (4.3.4)
     httpclient (2.8.3)
-    i18n (1.0.0)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     jwt (2.1.0)
     kaminari-actionview (1.1.1)
       actionview
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
     kgio (2.11.2)
+    kwalify (0.7.2)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.6.0)
@@ -193,7 +195,7 @@ GEM
       mini_mime (>= 0.1.1)
     memcachier (0.0.2)
     memoist (0.16.0)
-    memory_profiler (0.9.6)
+    memory_profiler (0.9.10)
     method_source (0.9.0)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
@@ -203,23 +205,23 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multipart-post (2.0.0)
-    nokogiri (1.8.2)
+    nokogiri (1.8.3)
       mini_portile2 (~> 2.3.0)
     ohanakapa (1.1.3)
       sawyer (~> 0.8)
     os (0.9.6)
     parallel (1.12.1)
-    parser (2.5.0.5)
+    parser (2.5.1.0)
       ast (~> 2.4.0)
-    poltergeist (1.17.0)
-      capybara (~> 2.1)
+    poltergeist (1.18.1)
+      capybara (>= 2.1, < 4)
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
-    powerpack (0.1.1)
+    powerpack (0.1.2)
     public_suffix (3.0.2)
-    puma (3.11.3)
-    rack (2.0.4)
-    rack-cache (1.7.1)
+    puma (3.11.4)
+    rack (2.0.5)
+    rack-cache (1.8.0)
       rack (>= 0.4)
     rack-mini-profiler (1.0.0)
       rack (>= 1.2.0)
@@ -249,19 +251,20 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    reek (4.8.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    reek (5.0.0)
       codeclimate-engine-rb (~> 0.4.0)
+      kwalify (~> 0.7.0)
       parser (>= 2.5.0.0, < 2.6)
-      rainbow (~> 3.0)
+      rainbow (>= 2.0, < 4.0)
     representable (3.0.4)
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.1.1)
+    retriable (3.1.2)
     rspec-core (3.7.0)
       rspec-support (~> 3.7.0)
     rspec-expectations (3.7.0)
@@ -279,9 +282,10 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.0)
-    rubocop (0.52.1)
+    rubocop (0.57.2)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.4.0.2, < 3.0)
+      parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
@@ -307,60 +311,60 @@ GEM
       faraday (~> 0.9)
       jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
+    simplecov-html (0.10.2)
     spring (2.0.2)
       activesupport (>= 4.2)
     spring-commands-rspec (1.0.4)
       spring (>= 0.9.1)
     spring-watcher-listen (2.0.1)
       listen (>= 2.7, < 4.0)
       spring (>= 1.2, < 3.0)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    stackprof (0.2.11)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    stackprof (0.2.12)
     sysexits (1.2.0)
     temple (0.8.0)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
     tilt (2.0.8)
-    tins (1.14.0)
+    tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uber (0.1.0)
-    uglifier (4.1.8)
+    uglifier (4.1.13)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
+    unicode-display_width (1.4.0)
     vcr (4.0.0)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (2.3.2)
+    webmock (3.4.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (3.4.3)
+    webpacker (3.5.3)
       activesupport (>= 4.2)
       rack-proxy (>= 0.6.1)
       railties (>= 4.2)
     websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.3)
-    xpath (3.0.0)
+    xpath (3.1.0)
       nokogiri (~> 1.8)
-    yard (0.9.12)
+    yard (0.9.14)
 
 PLATFORMS
   ruby
@@ -370,7 +374,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bummr
-  capybara (~> 2.4)
+  capybara
   compass-rails
   coveralls
   dalli (~> 2.7.1)
@@ -408,12 +412,12 @@ DEPENDENCIES
   stackprof
   uglifier
   vcr
-  webmock (~> 2.1)
+  webmock
   webpacker (~> 3.2)
   yard
 
 RUBY VERSION
    ruby 2.3.3p222
 
 BUNDLED WITH
-   1.14.6
+   1.16.2