Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
c1b142b8
Commit
c1b142b8
authored
May 29, 2019
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs after routing change
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8249fcf5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
spec/helpers/gitlab_routing_helper_spec.rb
spec/helpers/gitlab_routing_helper_spec.rb
+1
-1
spec/javascripts/boards/mock_data.js
spec/javascripts/boards/mock_data.js
+4
-4
spec/lib/gitlab/url_builder_spec.rb
spec/lib/gitlab/url_builder_spec.rb
+1
-1
spec/models/project_spec.rb
spec/models/project_spec.rb
+1
-1
No files found.
spec/helpers/gitlab_routing_helper_spec.rb
View file @
c1b142b8
...
@@ -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
spec/javascripts/boards/mock_data.js
View file @
c1b142b8
...
@@ -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
'
;
...
...
spec/lib/gitlab/url_builder_spec.rb
View file @
c1b142b8
...
@@ -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
...
...
spec/models/project_spec.rb
View file @
c1b142b8
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment