Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-09-04 11:03:36 +0300
committerPhil Hughes <me@iamphill.com>2018-09-07 13:28:02 +0300
commit93e84c8f28f9bad8c09a720ce008dba1f50aadcd (patch)
treeff3d8eccb75e42fb1f69a4af3661ab2d78c83588
parentebc15f4318ed23ccdfe7dc543721968ae92daae0 (diff)
fixed tests
-rw-r--r--locale/gitlab.pot6
-rw-r--r--spec/javascripts/ide/stores/actions/file_spec.js15
2 files changed, 6 insertions, 15 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index a9b0d8a4662..0faad99ff11 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2304,6 +2304,9 @@ msgstr ""
msgid "Discard"
msgstr ""
+msgid "Discard all changes"
+msgstr ""
+
msgid "Discard changes"
msgstr ""
@@ -6655,6 +6658,9 @@ msgstr ""
msgid "You will loose all changes you've made to this file. This action cannot be undone."
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"
msgstr ""
diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js
index bca2033ff97..1ca811e996b 100644
--- a/spec/javascripts/ide/stores/actions/file_spec.js
+++ b/spec/javascripts/ide/stores/actions/file_spec.js
@@ -692,21 +692,6 @@ describe('IDE store file actions', () => {
.then(done)
.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', () => {