diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-04-05 20:57:48 +0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-04-05 20:58:49 +0300 |
commit | 7c6f4adac9bc2f0bba46a4267f1081c7542e4dc4 (patch) | |
tree | 3c3f47365a5bcec9e5d0ebc7e1a4f094afcccc76 | |
parent | 62574be35d5a92c6c825912e1ab9969c5acdb7d9 (diff) |
Fix more specs
-rw-r--r-- | app/assets/javascripts/boards/models/issue.js | 2 | ||||
-rw-r--r-- | app/services/boards/issues/list_service.rb | 2 | ||||
-rw-r--r-- | spec/fixtures/api/schemas/issue.json | 2 | ||||
-rw-r--r-- | spec/javascripts/boards/issue_card_spec.js | 2 | ||||
-rw-r--r-- | spec/services/boards/issues/list_service_spec.rb | 2 |
5 files changed, 6 insertions, 4 deletions
diff --git a/app/assets/javascripts/boards/models/issue.js b/app/assets/javascripts/boards/models/issue.js index 85f98615cf4..b381d48d625 100644 --- a/app/assets/javascripts/boards/models/issue.js +++ b/app/assets/javascripts/boards/models/issue.js @@ -115,7 +115,7 @@ class ListIssue { } const projectPath = this.project ? this.project.path : ''; - return Vue.http.patch(this.path + '.json', data); + return Vue.http.patch(`${this.path}.json`, data); } } diff --git a/app/services/boards/issues/list_service.rb b/app/services/boards/issues/list_service.rb index 8a1796a1096..ac70a99c2c5 100644 --- a/app/services/boards/issues/list_service.rb +++ b/app/services/boards/issues/list_service.rb @@ -53,7 +53,7 @@ module Boards end def set_scope - params[:include_subgroups] = true if board.group_board? + params[:include_subgroups] = board.group_board? end def board_label_ids diff --git a/spec/fixtures/api/schemas/issue.json b/spec/fixtures/api/schemas/issue.json index b579e32c9aa..8833825e3fb 100644 --- a/spec/fixtures/api/schemas/issue.json +++ b/spec/fixtures/api/schemas/issue.json @@ -15,6 +15,8 @@ "relative_position": { "type": "integer" }, "issue_sidebar_endpoint": { "type": "string" }, "toggle_subscription_endpoint": { "type": "string" }, + "reference_path": { "type": "string" }, + "real_path": { "type": "string" }, "project": { "id": { "type": "integer" }, "path": { "type": "string" } diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js index aa01f7d6d09..be1ea0b57b4 100644 --- a/spec/javascripts/boards/issue_card_spec.js +++ b/spec/javascripts/boards/issue_card_spec.js @@ -42,7 +42,7 @@ describe('Issue card component', () => { labels: [list.label], assignees: [], reference_path: '#1', - real_path: '/test/1' + real_path: '/test/1', }); component = new Vue({ diff --git a/spec/services/boards/issues/list_service_spec.rb b/spec/services/boards/issues/list_service_spec.rb index 8d67bf67747..27a7bf0e605 100644 --- a/spec/services/boards/issues/list_service_spec.rb +++ b/spec/services/boards/issues/list_service_spec.rb @@ -102,7 +102,7 @@ describe Boards::Issues::ListService do it_behaves_like 'issues list service' end - context 'and group is an ancestor' do + context 'and group is an ancestor', :nested_groups do let(:parent) { create(:group) } let(:group) { create(:group, parent: parent) } let!(:backlog) { create(:backlog_list, board: board) } |