summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-09-07 01:27:21 +0200
committerTim Zallmann <tzallmann@gitlab.com>2018-09-07 12:25:50 +0200
commitb8ecb2c7eb5eeb488e4532b9011d681b398f165d (patch)
treec6b71bd189bad8e5c106bbb502f9adf43ffb0349 /app/assets
parent89c796db5c67d1d6698c46f75670f197e2647a8f (diff)
downloadgitlab-ce-b8ecb2c7eb5eeb488e4532b9011d681b398f165d.tar.gz
Added new tests for newly added mutations, actions, utils
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/diffs/components/app.vue9
-rw-r--r--app/assets/javascripts/diffs/store/utils.js2
-rw-r--r--app/assets/javascripts/notes/stores/utils.js1
3 files changed, 3 insertions, 9 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index 13ff79029d0..4261a99c52b 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -127,13 +127,8 @@ export default {
.then(() => {
requestIdleCallback(
() => {
- this.startRenderDiffsQueue()
- .then(() => {
- this.setDiscussions();
- })
- .catch(() => {
- createFlash(__('Something went wrong on our end. Please try again!'));
- });
+ this.setDiscussions();
+ this.startRenderDiffsQueue();
},
{ timeout: 1000 },
);
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index eb9bab09d38..e15588a58a8 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -182,8 +182,8 @@ export function trimFirstCharOfLineContent(line = {}) {
}
export function prepareDiffData(diffData) {
- let showingLines = 0;
const filesLength = diffData.diffFiles.length;
+ let showingLines = 0;
let i;
for (i = 0; i < filesLength; i += 1) {
const file = diffData.diffFiles[i];
diff --git a/app/assets/javascripts/notes/stores/utils.js b/app/assets/javascripts/notes/stores/utils.js
index 71533cd9c88..a6cfd1590f5 100644
--- a/app/assets/javascripts/notes/stores/utils.js
+++ b/app/assets/javascripts/notes/stores/utils.js
@@ -32,7 +32,6 @@ export const reduceDiscussionsToLineCodes = selectedDiscussions =>
const items = acc[note.line_code] || [];
if (note.diff_file) {
Object.assign(note, { fileHash: note.diff_file.file_hash });
- // delete note.diff_file;
}
items.push(note);