diff options
author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-29 21:10:24 +0300 |
commit | bd2822ce1f67c5e50ead272962840638fe37a1f7 (patch) | |
tree | 2b38d2d4943b1b70eb0bce66dc40a562accfc363 /spec/features/issues/filtered_search | |
parent | b452b0c7056e481778bfc5838d47dca813bf12ed (diff) | |
parent | a7976905d17c22b0f2caeb54fa7f468568412cd1 (diff) |
Merge remote-tracking branch 'origin/master' into sh-headless-chrome-support
Diffstat (limited to 'spec/features/issues/filtered_search')
-rw-r--r-- | spec/features/issues/filtered_search/recent_searches_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb index e9cb2850496..4ea22c8c194 100644 --- a/spec/features/issues/filtered_search/recent_searches_spec.rb +++ b/spec/features/issues/filtered_search/recent_searches_spec.rb @@ -107,6 +107,6 @@ describe 'Recent searches', js: true do set_recent_searches(project_1_local_storage_key, 'fail') visit project_issues_path(project_1) - expect(find('.flash-alert')).to have_text('An error occured while parsing recent searches') + expect(find('.flash-alert')).to have_text('An error occurred while parsing recent searches') end end |