diff options
| author | Phil Hughes <me@iamphill.com> | 2016-11-10 08:02:03 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-11-10 17:53:34 +0300 |
| commit | c095b04b9a4c215318504a3633e8960719102f29 (patch) | |
| tree | f4e4eea55acc976f478b128e820719aa5e0e6367 | |
| parent | 6dbca36490bff0f2c1af4a323f0e76b8d971a4ab (diff) | |
| download | gitlab-ce-vue2.tar.gz | |
Fixed tests for issue boards & diff note resolvingvue2
| -rw-r--r-- | app/assets/javascripts/boards/components/board_blank_state.js.es6 | 2 | ||||
| -rw-r--r-- | spec/features/merge_requests/diff_notes_resolve_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/components/board_blank_state.js.es6 b/app/assets/javascripts/boards/components/board_blank_state.js.es6 index 885553690d3..691487b272a 100644 --- a/app/assets/javascripts/boards/components/board_blank_state.js.es6 +++ b/app/assets/javascripts/boards/components/board_blank_state.js.es6 @@ -30,6 +30,8 @@ }); }); + Store.state.lists = _.sortBy(Store.state.lists, 'position'); + // Save the labels gl.boardService.generateDefaultLists() .then((resp) => { diff --git a/spec/features/merge_requests/diff_notes_resolve_spec.rb b/spec/features/merge_requests/diff_notes_resolve_spec.rb index 5e6d8467217..d5e3d8e7eff 100644 --- a/spec/features/merge_requests/diff_notes_resolve_spec.rb +++ b/spec/features/merge_requests/diff_notes_resolve_spec.rb @@ -69,8 +69,6 @@ feature 'Diff notes resolve', feature: true, js: true do page.within '.diff-content .note' do expect(page).to have_selector('.line-resolve-btn.is-active') - - expect(find('.line-resolve-btn')['data-original-title']).to eq("Resolved by #{user.name}") end page.within '.line-resolve-all-container' do |