mirror of
https://github.com/Fishwaldo/huginn.git
synced 2025-03-15 19:31:26 +00:00
Merge pull request #1435 from omniscopeio/capybara-stability
Improves wait time when writing test you expect to fail
This commit is contained in:
commit
dd76553662
4 changed files with 10 additions and 8 deletions
2
Gemfile
2
Gemfile
|
@ -142,9 +142,9 @@ group :development do
|
|||
|
||||
group :test do
|
||||
gem 'coveralls', require: false
|
||||
gem 'capybara-select2', require: false
|
||||
gem 'delorean'
|
||||
gem 'poltergeist'
|
||||
gem 'capybara-select2', require: false
|
||||
gem 'pry-rails'
|
||||
gem 'rr'
|
||||
gem 'rspec', '~> 3.2'
|
||||
|
|
|
@ -3,12 +3,14 @@ require 'capybara/rails'
|
|||
require 'capybara/poltergeist'
|
||||
require 'capybara-select2'
|
||||
|
||||
CAPYBARA_TIMEOUT = ENV['CI'] == 'true' ? 60 : 5
|
||||
|
||||
Capybara.register_driver :poltergeist do |app|
|
||||
Capybara::Poltergeist::Driver.new(app, timeout: 60)
|
||||
Capybara::Poltergeist::Driver.new(app, timeout: CAPYBARA_TIMEOUT)
|
||||
end
|
||||
|
||||
Capybara.javascript_driver = :poltergeist
|
||||
Capybara.default_max_wait_time = 60
|
||||
Capybara.default_max_wait_time = CAPYBARA_TIMEOUT
|
||||
|
||||
RSpec.configure do |config|
|
||||
config.include Warden::Test::Helpers
|
||||
|
|
|
@ -22,7 +22,7 @@ describe Admin::UsersController do
|
|||
visit admin_users_path
|
||||
find(:css, "a[href='/admin/users/#{users(:bob).id}']").click
|
||||
expect(page).to have_text("User 'bob' was deleted.")
|
||||
expect(page).not_to have_text('bob@example.com')
|
||||
expect(page).to have_no_text('bob@example.com')
|
||||
end
|
||||
|
||||
context "creating new users" do
|
||||
|
@ -82,12 +82,12 @@ describe Admin::UsersController do
|
|||
context "(de)activating users" do
|
||||
it "does not show deactivation buttons for the current user" do
|
||||
visit admin_users_path
|
||||
expect(page).not_to have_css("a[href='/admin/users/#{users(:jane).id}/deactivate']")
|
||||
expect(page).to have_no_css("a[href='/admin/users/#{users(:jane).id}/deactivate']")
|
||||
end
|
||||
|
||||
it "deactivates an existing user" do
|
||||
visit admin_users_path
|
||||
expect(page).not_to have_text('inactive')
|
||||
expect(page).to have_no_text('inactive')
|
||||
find(:css, "a[href='/admin/users/#{users(:bob).id}/deactivate']").click
|
||||
expect(page).to have_text('inactive')
|
||||
users(:bob).reload
|
||||
|
@ -98,7 +98,7 @@ describe Admin::UsersController do
|
|||
users(:bob).deactivate!
|
||||
visit admin_users_path
|
||||
find(:css, "a[href='/admin/users/#{users(:bob).id}/activate']").click
|
||||
expect(page).not_to have_text('inactive')
|
||||
expect(page).to have_no_text('inactive')
|
||||
users(:bob).reload
|
||||
expect(users(:bob)).to be_active
|
||||
end
|
||||
|
|
|
@ -13,4 +13,4 @@ describe "Creating a new agent", js: true do
|
|||
|
||||
expect(page).to have_text("Test Trigger Agent")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Reference in a new issue