kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fixed tests

Browse source
This commit is contained in:
Phil Hughes 2018-09-04 09:03:36 +01:00
parent ebc15f4318
commit 93e84c8f28
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
locale/gitlab.pot
View file

@ -2304,6 +2304,9 @@ msgstr ""
msgid "Discard" msgid "Discard"
msgstr "" msgstr ""
msgid "Discard all changes"
msgstr ""
msgid "Discard changes" msgid "Discard changes"
msgstr "" msgstr ""
@ -6655,6 +6658,9 @@ msgstr ""
msgid "You will loose all changes you've made to this file. This action cannot be undone." msgid "You will loose all changes you've made to this file. This action cannot be undone."
msgstr "" msgstr ""
msgid "You will loose all the unstaged changes you've made in this project. This action cannot be undone."
msgstr ""
msgid "You will not get any notifications via email" msgid "You will not get any notifications via email"
msgstr "" msgstr ""

15
spec/javascripts/ide/stores/actions/file_spec.js
View file

@ -692,21 +692,6 @@ describe('IDE store file actions', () => {
.then(done) .then(done)
.catch(done.fail); .catch(done.fail);
}); });
it('calls scrollToTab', done => {
const scrollToTabSpy = jasmine.createSpy('scrollToTab');
const oldScrollToTab = store._actions.scrollToTab; // eslint-disable-line
store._actions.scrollToTab = [scrollToTabSpy]; // eslint-disable-line
store
.dispatch('openPendingTab', { file: f, keyPrefix: 'pending' })
.then(() => {
expect(scrollToTabSpy).toHaveBeenCalled();
store._actions.scrollToTab = oldScrollToTab; // eslint-disable-line
})
.then(done)
.catch(done.fail);
});
}); });
describe('removePendingTab', () => { describe('removePendingTab', () => {