1 files changed, 52 insertions, 29 deletions
diff --git a/spec/helpers/boards_helper_spec.rb b/spec/helpers/boards_helper_spec.rb
index b85ebec5545..b00ee19cea2 100644
--- a/spec/helpers/boards_helper_spec.rb
+++ b/spec/helpers/boards_helper_spec.rb
@@ -3,52 +3,71 @@
 require 'spec_helper'
 
 RSpec.describe BoardsHelper do
-  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:base_group) { create(:group, path: 'base') }
+  let_it_be(:project) { create(:project, group: base_group) }
+  let_it_be(:project_board) { create(:board, project: project) }
+  let_it_be(:group_board) { create(:board, group: base_group) }
 
   describe '#build_issue_link_base' do
     context 'project board' do
       it 'returns correct path for project board' do
-        @project = project
-        @board = create(:board, project: @project)
+        assign(:project, project)
+        assign(:board, project_board)
 
-        expect(build_issue_link_base).to eq("/#{@project.namespace.path}/#{@project.path}/-/issues")
+        expect(helper.build_issue_link_base).to eq("/#{project.namespace.path}/#{project.path}/-/issues")
       end
     end
 
     context 'group board' do
-      let(:base_group) { create(:group, path: 'base') }
-
       it 'returns correct path for base group' do
-        @board = create(:board, group: base_group)
+        assign(:board, group_board)
 
-        expect(build_issue_link_base).to eq('/base/:project_path/issues')
+        expect(helper.build_issue_link_base).to eq('/base/:project_path/issues')
       end
 
       it 'returns correct path for subgroup' do
         subgroup = create(:group, parent: base_group, path: 'sub')
-        @board = create(:board, group: subgroup)
+        assign(:board, create(:board, group: subgroup))
 
-        expect(build_issue_link_base).to eq('/base/sub/:project_path/issues')
+        expect(helper.build_issue_link_base).to eq('/base/sub/:project_path/issues')
       end
     end
   end
 
-  describe '#board_data' do
-    let_it_be(:user) { create(:user) }
-    let_it_be(:board) { create(:board, project: project) }
+  describe '#board_base_url' do
+    context 'when project board' do
+      it 'generates the correct url' do
+        assign(:board, group_board)
+        assign(:group, base_group)
+
+        expect(helper.board_base_url).to eq "http://test.host/groups/#{base_group.full_path}/-/boards"
+      end
+    end
+
+    context 'when project board' do
+      it 'generates the correct url' do
+        assign(:board, project_board)
+        assign(:project, project)
+
+        expect(helper.board_base_url).to eq "/#{project.full_path}/-/boards"
+      end
+    end
+  end
 
+  describe '#board_data' do
     context 'project_board' do
       before do
         assign(:project, project)
-        assign(:board, board)
+        assign(:board, project_board)
 
         allow(helper).to receive(:current_user) { user }
-        allow(helper).to receive(:can?).with(user, :create_non_backlog_issues, board).and_return(true)
-        allow(helper).to receive(:can?).with(user, :admin_issue, board).and_return(true)
+        allow(helper).to receive(:can?).with(user, :create_non_backlog_issues, project_board).and_return(true)
+        allow(helper).to receive(:can?).with(user, :admin_issue, project_board).and_return(true)
       end
 
       it 'returns a board_lists_path as lists_endpoint' do
-        expect(helper.board_data[:lists_endpoint]).to eq(board_lists_path(board))
+        expect(helper.board_data[:lists_endpoint]).to eq(board_lists_path(project_board))
       end
 
       it 'returns board type as parent' do
@@ -63,28 +82,33 @@ RSpec.describe BoardsHelper do
         expect(helper.board_data[:labels_fetch_path]).to eq("/#{project.full_path}/-/labels.json?include_ancestor_groups=true")
         expect(helper.board_data[:labels_manage_path]).to eq("/#{project.full_path}/-/labels")
       end
+
+      it 'returns the group id of a project' do
+        expect(helper.board_data[:group_id]).to eq(project.group.id)
+      end
     end
 
     context 'group board' do
-      let_it_be(:group) { create(:group, path: 'base') }
-      let_it_be(:board) { create(:board, group: group) }
-
       before do
-        assign(:group, group)
-        assign(:board, board)
+        assign(:group, base_group)
+        assign(:board, group_board)
 
         allow(helper).to receive(:current_user) { user }
-        allow(helper).to receive(:can?).with(user, :create_non_backlog_issues, board).and_return(true)
-        allow(helper).to receive(:can?).with(user, :admin_issue, board).and_return(true)
+        allow(helper).to receive(:can?).with(user, :create_non_backlog_issues, group_board).and_return(true)
+        allow(helper).to receive(:can?).with(user, :admin_issue, group_board).and_return(true)
       end
 
       it 'returns correct path for base group' do
-        expect(helper.build_issue_link_base).to eq('/base/:project_path/issues')
+        expect(helper.build_issue_link_base).to eq("/#{base_group.full_path}/:project_path/issues")
       end
 
       it 'returns required label endpoints' do
-        expect(helper.board_data[:labels_fetch_path]).to eq("/groups/base/-/labels.json?include_ancestor_groups=true&only_group_labels=true")
-        expect(helper.board_data[:labels_manage_path]).to eq("/groups/base/-/labels")
+        expect(helper.board_data[:labels_fetch_path]).to eq("/groups/#{base_group.full_path}/-/labels.json?include_ancestor_groups=true&only_group_labels=true")
+        expect(helper.board_data[:labels_manage_path]).to eq("/groups/#{base_group.full_path}/-/labels")
+      end
+
+      it 'returns the group id' do
+        expect(helper.board_data[:group_id]).to eq(base_group.id)
       end
     end
   end
@@ -93,8 +117,7 @@ RSpec.describe BoardsHelper do
     let(:board_json) { helper.current_board_json }
 
     it 'can serialise with a basic set of attributes' do
-      board = create(:board, project: project)
-      assign(:board, board)
+      assign(:board, project_board)
 
       expect(board_json).to match_schema('current-board')
     end