Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
language: ruby
dist: trusty
cache: bundler
bundler_args: '--without development'
env:
global:
- DATABASE_URL=postgres://postgres@localhost/timeoverflow_test
- CC_TEST_REPORTER_ID=025bc15a0fa9afa52d86ee24fea845cf1d363f48a466bcf2cef8ab80c29acb28
before_install:
- gem install bundler:1.17.0
before_script:
- bundle exec rake db:setup
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
Expand Down
8 changes: 4 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
33 changes: 15 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,16 @@ 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)
rack (>= 1.6.0)
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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion spec/features/sign_in_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down