diff options
| author | Mike Greiling <mike@pixelcog.com> | 2016-12-08 16:13:23 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2016-12-10 00:57:23 -0600 |
| commit | 7f3fc26ec98193fa0c3bfeb7b78c81176bb9c689 (patch) | |
| tree | 9c47f4e7aca154f02acf6d89d2e11fcfc761296c | |
| parent | 68c1e3a1568d9f61bf1e01d6ff55ce59c5c3eaaf (diff) | |
| download | gitlab-ce-7f3fc26ec98193fa0c3bfeb7b78c81176bb9c689.tar.gz | |
fix failing tests
| -rw-r--r-- | app/views/shared/snippets/_snippet.html.haml | 4 | ||||
| -rw-r--r-- | features/steps/project/snippets.rb | 2 | ||||
| -rw-r--r-- | spec/features/dashboard/datetime_on_tooltips_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/shared/snippets/_snippet.html.haml b/app/views/shared/snippets/_snippet.html.haml index 95985ad6afb..65946910529 100644 --- a/app/views/shared/snippets/_snippet.html.haml +++ b/app/views/shared/snippets/_snippet.html.haml @@ -21,9 +21,9 @@ .snippet-info #{snippet.to_reference} · - authored #{time_ago_with_tooltip(snippet.created_at, placement: 'bottom')} by + authored #{time_ago_with_tooltip(snippet.created_at, placement: 'bottom', html_class: 'snippet-created-ago')} by = link_to user_snippets_path(snippet.author) do = snippet.author_name .pull-right.snippet-updated-at - %span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom', html_class: 'snippet_update_ago')} + %span updated #{time_ago_with_tooltip(snippet.updated_at, placement: 'bottom')} diff --git a/features/steps/project/snippets.rb b/features/steps/project/snippets.rb index 5e7d539add6..a3bebfa4b71 100644 --- a/features/steps/project/snippets.rb +++ b/features/steps/project/snippets.rb @@ -22,7 +22,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps end step 'I click link "New snippet"' do - click_link "New snippet" + first(:link, "New snippet").click end step 'I click link "Snippet one"' do diff --git a/spec/features/dashboard/datetime_on_tooltips_spec.rb b/spec/features/dashboard/datetime_on_tooltips_spec.rb index 365cb445df1..44dfc2dff45 100644 --- a/spec/features/dashboard/datetime_on_tooltips_spec.rb +++ b/spec/features/dashboard/datetime_on_tooltips_spec.rb @@ -36,7 +36,7 @@ feature 'Tooltips on .timeago dates', feature: true, js: true do visit user_snippets_path(user) wait_for_ajax() - page.find('.js-timeago').hover + page.find('.js-timeago.snippet-created-ago').hover end it 'has the datetime formated correctly' do |