diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2017-09-28 15:56:38 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2017-09-28 15:56:38 +0000 |
commit | cd5896ed7b8a63b98cd48dd5cb17a8838657d4f0 (patch) | |
tree | f14dc462d6a7b342bd15f1a00302601228ea3c0e /spec | |
parent | 3209c071402cc14b006aabd45bd310395cef53a5 (diff) | |
parent | 0ed23790a43a0fd5001773937c66a06533f60c6c (diff) | |
download | gitlab-ce-cd5896ed7b8a63b98cd48dd5cb17a8838657d4f0.tar.gz |
Merge branch 'jramsay-spelling-occurred' into 'master'
Fix spelling of occurred
See merge request gitlab-org/gitlab-ce!14488
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/issues/filtered_search/recent_searches_spec.rb | 2 | ||||
-rw-r--r-- | spec/javascripts/blob/notebook/index_spec.js | 4 | ||||
-rw-r--r-- | spec/javascripts/blob/pdf/index_spec.js | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/issues/filtered_search/recent_searches_spec.rb b/spec/features/issues/filtered_search/recent_searches_spec.rb index 5eeecaeda47..447281ed19d 100644 --- a/spec/features/issues/filtered_search/recent_searches_spec.rb +++ b/spec/features/issues/filtered_search/recent_searches_spec.rb @@ -104,6 +104,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 diff --git a/spec/javascripts/blob/notebook/index_spec.js b/spec/javascripts/blob/notebook/index_spec.js index 11f2a950678..c3e67550f05 100644 --- a/spec/javascripts/blob/notebook/index_spec.js +++ b/spec/javascripts/blob/notebook/index_spec.js @@ -117,7 +117,7 @@ describe('iPython notebook renderer', () => { it('shows error message', () => { expect( document.querySelector('.md').textContent.trim(), - ).toBe('An error occured whilst parsing the file.'); + ).toBe('An error occurred whilst parsing the file.'); }); }); @@ -153,7 +153,7 @@ describe('iPython notebook renderer', () => { it('shows error message', () => { expect( document.querySelector('.md').textContent.trim(), - ).toBe('An error occured whilst loading the file. Please try again later.'); + ).toBe('An error occurred whilst loading the file. Please try again later.'); }); }); }); diff --git a/spec/javascripts/blob/pdf/index_spec.js b/spec/javascripts/blob/pdf/index_spec.js index bbeaf95e68d..51bf3086627 100644 --- a/spec/javascripts/blob/pdf/index_spec.js +++ b/spec/javascripts/blob/pdf/index_spec.js @@ -76,7 +76,7 @@ describe('PDF renderer', () => { it('shows error message', () => { expect( document.querySelector('.md').textContent.trim(), - ).toBe('An error occured whilst loading the file. Please try again later.'); + ).toBe('An error occurred whilst loading the file. Please try again later.'); }); }); }); |