Skip to content

Commit

Permalink
Merge pull request #178 from EFForg/gem-updates
Browse files Browse the repository at this point in the history
Gem updates
  • Loading branch information
vbrown608 committed Oct 31, 2018
2 parents 406d798 + 72af020 commit e51d9c8
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -44,7 +44,7 @@ group :development, :test do
gem "byebug", platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem "capybara", "~> 2.13"
gem "selenium-webdriver"
gem "selenium-webdriver", "~> 3.14"
end

group :development do
Expand Down
26 changes: 13 additions & 13 deletions Gemfile.lock
Expand Up @@ -76,7 +76,7 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.8.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coffee-rails (4.2.2)
coffee-script (>= 2.2.0)
Expand All @@ -86,7 +86,7 @@ GEM
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.0.5)
crass (1.0.3)
crass (1.0.4)
devise (4.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
Expand All @@ -112,7 +112,7 @@ GEM
railties (>= 3.0.0)
faraday (0.14.0)
multipart-post (>= 1.2, < 3)
ffi (1.9.18)
ffi (1.9.25)
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic_i18n (0.6.0)
Expand Down Expand Up @@ -162,7 +162,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.1.1)
loofah (2.2.3)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
Expand All @@ -176,7 +176,7 @@ GEM
multipart-post (2.0.0)
netrc (0.11.0)
nio4r (2.2.0)
nokogiri (1.8.2)
nokogiri (1.8.5)
mini_portile2 (~> 2.3.0)
orm_adapter (0.5.0)
parallel (1.12.1)
Expand All @@ -188,7 +188,7 @@ GEM
powerpack (0.1.1)
public_suffix (3.0.1)
puma (3.11.2)
rack (2.0.4)
rack (2.0.5)
rack-test (0.8.2)
rack (>= 1.0, < 3)
rails (5.1.4)
Expand All @@ -206,8 +206,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.4)
actionpack (= 5.1.4)
activesupport (= 5.1.4)
Expand Down Expand Up @@ -262,25 +262,25 @@ GEM
rubocop (~> 0.51)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
rubyzip (1.2.2)
sass (3.4.25)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.8.0)
selenium-webdriver (3.14.1)
childprocess (~> 0.5)
rubyzip (~> 1.0)
rubyzip (~> 1.2, >= 1.2.2)
sentry-raven (2.7.2)
faraday (>= 0.7.6, < 1.0)
spring (2.0.2)
activesupport (>= 4.2)
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-es6 (0.9.2)
Expand Down Expand Up @@ -342,7 +342,7 @@ DEPENDENCIES
rspec-rails
rubocop-github
sass-rails (~> 5.0)
selenium-webdriver
selenium-webdriver (~> 3.14)
sentry-raven
spring
spring-watcher-listen (~> 2.0.0)
Expand Down
2 changes: 1 addition & 1 deletion app/helpers/congress_members_helper.rb
Expand Up @@ -2,7 +2,7 @@
module CongressMembersHelper
def congress_member_photo(member)
avatar = ["#{member.bioguide_id}.jpg", "default.svg"].find do |file|
File.exists?(Rails.root.join("app/assets/images/rep-photos/#{file}"))
File.exist?(Rails.root.join("app/assets/images/rep-photos/#{file}"))
end

image_tag "rep-photos/#{avatar}"
Expand Down
2 changes: 1 addition & 1 deletion app/models/score.rb
Expand Up @@ -2,7 +2,7 @@
class Score < ApplicationRecord
DEFAULT_POSITION = "Uncommitted"
POSITIONS = (%w(Yes No) << DEFAULT_POSITION).freeze
NULL_POSITIONS = [nil, '']
NULL_POSITIONS = [nil, ""]

belongs_to :congress_member
validates_uniqueness_of :congress_member
Expand Down

0 comments on commit e51d9c8

Please sign in to comment.