Commit c1b142b8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix specs after routing change

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 8249fcf5
...@@ -101,7 +101,7 @@ describe GitlabRoutingHelper do ...@@ -101,7 +101,7 @@ describe GitlabRoutingHelper do
it 'returns project milestone edit path when given entity parent is not a Group' do it 'returns project milestone edit path when given entity parent is not a Group' do
milestone = create(:milestone, group: nil) milestone = create(:milestone, group: nil)
expect(edit_milestone_path(milestone)).to eq("/#{milestone.project.full_path}/milestones/#{milestone.iid}/edit") expect(edit_milestone_path(milestone)).to eq("/#{milestone.project.full_path}/-/milestones/#{milestone.iid}/edit")
end end
end end
end end
...@@ -47,7 +47,7 @@ export const BoardsMockData = { ...@@ -47,7 +47,7 @@ export const BoardsMockData = {
}, },
], ],
}, },
'/test/issue-boards/milestones.json': [ '/test/issue-boards/-/milestones.json': [
{ {
id: 1, id: 1,
title: 'test', title: 'test',
...@@ -58,10 +58,10 @@ export const BoardsMockData = { ...@@ -58,10 +58,10 @@ export const BoardsMockData = {
'/test/-/boards/1/lists': listObj, '/test/-/boards/1/lists': listObj,
}, },
PUT: { PUT: {
'/test/issue-boards/board/1/lists{/id}': {}, '/test/issue-boards/-/board/1/lists{/id}': {},
}, },
DELETE: { DELETE: {
'/test/issue-boards/board/1/lists{/id}': {}, '/test/issue-boards/-/board/1/lists{/id}': {},
}, },
}; };
...@@ -71,7 +71,7 @@ export const boardsMockInterceptor = config => { ...@@ -71,7 +71,7 @@ export const boardsMockInterceptor = config => {
}; };
export const mockBoardService = (opts = {}) => { export const mockBoardService = (opts = {}) => {
const boardsEndpoint = opts.boardsEndpoint || '/test/issue-boards/boards.json'; const boardsEndpoint = opts.boardsEndpoint || '/test/issue-boards/-/boards.json';
const listsEndpoint = opts.listsEndpoint || '/test/-/boards/1/lists'; const listsEndpoint = opts.listsEndpoint || '/test/-/boards/1/lists';
const bulkUpdatePath = opts.bulkUpdatePath || ''; const bulkUpdatePath = opts.bulkUpdatePath || '';
const boardId = opts.boardId || '1'; const boardId = opts.boardId || '1';
......
...@@ -32,7 +32,7 @@ describe Gitlab::UrlBuilder do ...@@ -32,7 +32,7 @@ describe Gitlab::UrlBuilder do
url = described_class.build(milestone) url = described_class.build(milestone)
expect(url).to eq "#{Settings.gitlab['url']}/#{milestone.project.full_path}/milestones/#{milestone.iid}" expect(url).to eq "#{Settings.gitlab['url']}/#{milestone.project.full_path}/-/milestones/#{milestone.iid}"
end end
end end
......
...@@ -1147,7 +1147,7 @@ describe Project do ...@@ -1147,7 +1147,7 @@ describe Project do
allow(project).to receive(:avatar_in_git) { true } allow(project).to receive(:avatar_in_git) { true }
end end
let(:avatar_path) { "/#{project.full_path}/avatar" } let(:avatar_path) { "/#{project.full_path}/-/avatar" }
it { is_expected.to eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" } it { is_expected.to eq "http://#{Gitlab.config.gitlab.host}#{avatar_path}" }
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment