diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-17 11:13:16 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-17 11:13:16 +0100 |
| commit | 481e73fb76bbdc845ba6899682ab5fa8c05b11bc (patch) | |
| tree | 70becb0067bba3e9f529e81a3bca9608408929a9 /features | |
| parent | 48274581551b73575149463be0c050f6b5a564ee (diff) | |
| parent | 4171933c0963696626c879c2d05afa1594a71d99 (diff) | |
| download | gitlab-ce-481e73fb76bbdc845ba6899682ab5fa8c05b11bc.tar.gz | |
Merge branch 'master' into new-branch-button-issue
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/search.rb | 2 | ||||
| -rw-r--r-- | features/support/capybara.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/features/steps/search.rb b/features/steps/search.rb index 48ea3fa3876..0ad837ebe1d 100644 --- a/features/steps/search.rb +++ b/features/steps/search.rb @@ -100,7 +100,7 @@ class Spinach::Features::Search < Spinach::FeatureSteps step 'I should see "test_wiki" link in the search results' do page.within('.results') do - find(:css, '.search-results').should have_link 'test_wiki.md' + expect(find(:css, '.search-results')).to have_link 'test_wiki' end end diff --git a/features/support/capybara.rb b/features/support/capybara.rb index f33379f76c9..fe9e39cf509 100644 --- a/features/support/capybara.rb +++ b/features/support/capybara.rb @@ -9,7 +9,7 @@ Capybara.register_driver :poltergeist do |app| Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768]) end -Capybara.default_wait_time = timeout +Capybara.default_max_wait_time = timeout Capybara.ignore_hidden_elements = false unless ENV['CI'] || ENV['CI_SERVER'] |