diff --git a/.travis.yml b/.travis.yml index cdb98cbec..2b0ff1d7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ language: ruby +dist: trusty cache: bundler bundler_args: '--without development' env: diff --git a/Gemfile b/Gemfile index 09cc1803f..0daecce68 100644 --- a/Gemfile +++ b/Gemfile @@ -60,8 +60,8 @@ group :test do gem 'shoulda-matchers', '~> 3.1.2' gem 'fabrication' gem 'faker', '~> 1.9' - gem 'capybara', '~> 3.13' - gem 'selenium-webdriver', '~> 3.141' - gem 'webdrivers', '~> 3.0' - gem 'simplecov', '~> 0.16.1', require: false + gem 'capybara', '~> 3.15' + gem 'selenium-webdriver', '~> 3.142' + gem 'webdrivers', '~> 4.1.2' + gem 'simplecov', '~> 0.17', require: false end diff --git a/Gemfile.lock b/Gemfile.lock index 173fbbb20..1ce576e7f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM capistrano-rbenv (2.1.3) capistrano (~> 3.1) sshkit (~> 1.3) - capybara (3.13.2) + capybara (3.15.1) addressable mini_mime (>= 0.1.3) nokogiri (~> 1.8) @@ -92,8 +92,8 @@ GEM rack-test (>= 0.6.3) regexp_parser (~> 1.2) xpath (~> 3.2) - childprocess (0.9.0) - ffi (~> 1.0, >= 1.0.11) + childprocess (1.0.1) + rake (< 13.0) chronic (0.10.2) coderay (1.1.2) coffee-rails (4.1.0) @@ -117,7 +117,7 @@ GEM responders warden (~> 1.2.3) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.20170223) unf (>= 0.0.5, < 1.0.0) dotenv (2.7.1) @@ -132,7 +132,6 @@ GEM fabrication (2.11.3) faker (1.9.3) i18n (>= 0.7) - ffi (1.10.0) formtastic (3.1.5) actionpack (>= 3.2.13) formtastic_i18n (0.6.0) @@ -196,7 +195,6 @@ GEM net-scp (1.2.1) net-ssh (>= 2.6.5) net-ssh (2.9.2) - net_http_ssl_fix (0.0.10) netrc (0.11.0) nokogiri (1.8.5) mini_portile2 (~> 2.3.0) @@ -263,7 +261,7 @@ GEM polyamorous (~> 1.3.2) rdiscount (2.1.7.1) redis (4.0.1) - regexp_parser (1.3.0) + regexp_parser (1.6.0) responders (2.4.0) actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) @@ -298,7 +296,7 @@ GEM ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) ruby-progressbar (1.9.0) - rubyzip (1.2.2) + rubyzip (1.2.3) rufus-scheduler (3.4.2) et-orbi (~> 1.0) sass (3.4.21) @@ -310,8 +308,8 @@ GEM tilt (>= 1.1, < 3) select2-rails (4.0.1) thor (~> 0.14) - selenium-webdriver (3.141.0) - childprocess (~> 0.5) + selenium-webdriver (3.142.3) + childprocess (>= 0.5, < 2.0) rubyzip (~> 1.2, >= 1.2.2) shoulda-matchers (3.1.2) activesupport (>= 4.0.0) @@ -326,7 +324,7 @@ GEM simple_form (3.1.0) actionpack (~> 4.0) activemodel (~> 4.0) - simplecov (0.16.1) + simplecov (0.17.0) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) @@ -369,11 +367,10 @@ GEM binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - webdrivers (3.7.2) - net_http_ssl_fix + webdrivers (4.1.2) nokogiri (~> 1.6) rubyzip (~> 1.0) - selenium-webdriver (~> 3.0) + selenium-webdriver (>= 3.0, < 4.0) whenever (0.9.4) chronic (>= 0.6.3) xpath (3.2.0) @@ -392,7 +389,7 @@ DEPENDENCIES capistrano (~> 3.1) capistrano-rails (~> 1.1) capistrano-rbenv (~> 2.1) - capybara (~> 3.13) + capybara (~> 3.15) coffee-rails dalli database_cleaner (= 1.6.2) @@ -421,17 +418,17 @@ DEPENDENCIES rufus-scheduler (~> 3.4.2) sass-rails (~> 5.0.7) select2-rails - selenium-webdriver (~> 3.141) + selenium-webdriver (~> 3.142) shoulda-matchers (~> 3.1.2) sidekiq (= 5.1.3) sidekiq-cron (= 0.6.3) simple_form (>= 3.0.0) - simplecov (~> 0.16.1) + simplecov (~> 0.17) skylight uglifier (= 2.7.2) unicorn web-console (= 2.1.3) - webdrivers (~> 3.0) + webdrivers (~> 4.1.2) whenever RUBY VERSION diff --git a/spec/features/sign_in_spec.rb b/spec/features/sign_in_spec.rb index bad23fd2a..03b83d9d9 100644 --- a/spec/features/sign_in_spec.rb +++ b/spec/features/sign_in_spec.rb @@ -7,7 +7,7 @@ context 'with a valid password' do it 'signs the user in' do - expect(Capybara.current_session.driver.browser.manage.cookie_named('_timeoverflow_session')).to be_falsy + Capybara.current_session.driver.browser.manage.delete_cookie('_timeoverflow_session') sign_in_with(user.email, user.password) @@ -19,6 +19,7 @@ context 'with an invalid password' do it 'shows an error' do sign_in_with(user.email, 'wrong_password') + expect(page).to have_content(I18n.t('devise.failure.invalid')) end end