diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-12-07 21:52:47 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-12-07 21:52:47 +0000 |
| commit | 2928e19d4356683119cf0d2bb269752253ea5d50 (patch) | |
| tree | 8ee4d73b42802403e4d17d1c8d1bb3db2de2ed6c | |
| parent | 24ab860554f7801e5d69ce54289565cca810328d (diff) | |
| parent | a1d3b8d7fa61f757978e237dd95de8eeb186212c (diff) | |
| download | gitlab-ce-2928e19d4356683119cf0d2bb269752253ea5d50.tar.gz | |
Merge branch 'rs-spec-failure' into 'master'
Fix spec failure introduced by 9d03bc6fa31f123e070bab4a58b67dbb008e75e9
See merge request !2006
| -rw-r--r-- | spec/helpers/application_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 0a64b70d6a6..5568f06639c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -278,7 +278,7 @@ describe ApplicationHelper do el = element.next_element expect(el.name).to eq 'script' - expect(el.text).to include "$('.js-timeago').timeago()" + expect(el.text).to include "$('.js-timeago').last().timeago()" end it 'allows the script tag to be excluded' do |