diff options
author | Phil Hughes <me@iamphill.com> | 2018-08-02 16:28:44 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-08-02 16:28:44 +0300 |
commit | bc827dfd3abbf57ec53c28939c26395fca906abd (patch) | |
tree | 081d8b9e779062494d37f9f9413c256048555379 /spec | |
parent | 6ce90bfb9fbe122f68765a30cccf560f9caa089b (diff) |
fixed review mode diffs
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/ide/stores/modules/commit/actions_spec.js | 2 | ||||
-rw-r--r-- | spec/javascripts/ide/stores/utils_spec.js | 44 |
2 files changed, 5 insertions, 41 deletions
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/javascripts/ide/stores/modules/commit/actions_spec.js index c8d9b38491c..5ef842db0b2 100644 --- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/commit/actions_spec.js @@ -294,7 +294,7 @@ describe('IDE commit module actions', () => { { action: 'update', file_path: jasmine.anything(), - content: jasmine.anything(), + content: undefined, encoding: jasmine.anything(), last_commit_id: undefined, previous_path: undefined, diff --git a/spec/javascripts/ide/stores/utils_spec.js b/spec/javascripts/ide/stores/utils_spec.js index f1a3879ccea..9f18034f8a3 100644 --- a/spec/javascripts/ide/stores/utils_spec.js +++ b/spec/javascripts/ide/stores/utils_spec.js @@ -125,7 +125,7 @@ describe('Multi-file store utils', () => { { action: 'delete', file_path: 'deletedFile', - content: '', + content: undefined, encoding: 'text', last_commit_id: undefined, previous_path: undefined, @@ -210,7 +210,7 @@ describe('Multi-file store utils', () => { }); describe('getCommitFiles', () => { - it('returns flattened list of files and folders', () => { + it('returns list of files excluding moved files', () => { const files = [ { path: 'a', @@ -218,30 +218,9 @@ describe('Multi-file store utils', () => { deleted: true, }, { - path: 'b', - type: 'tree', - deleted: true, - tree: [ - { - path: 'c', - type: 'blob', - }, - { - path: 'd', - type: 'blob', - }, - ], - }, - { path: 'c', - prevPath: 'x', - type: 'tree', - tree: [ - { - path: 'c/index.js', - type: 'blob', - }, - ], + type: 'blob', + moved: true, }, ]; @@ -253,21 +232,6 @@ describe('Multi-file store utils', () => { type: 'blob', deleted: true, }, - { - path: 'c', - type: 'blob', - deleted: true, - }, - { - path: 'd', - type: 'blob', - deleted: true, - }, - { - path: 'c/index.js', - type: 'blob', - deleted: true, - }, ]); }); }); |