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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
40be7b33
Commit
40be7b33
authored
Nov 28, 2018
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve spec/models/project_spec.rb
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
88eba240
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
12 deletions
+0
-12
spec/models/project_spec.rb
spec/models/project_spec.rb
+0
-12
No files found.
spec/models/project_spec.rb
View file @
40be7b33
...
...
@@ -1815,7 +1815,6 @@ describe Project do
end
describe
'handling import URL'
do
<<<<<<<
HEAD
context
'when project is a mirror'
do
it
'returns the full URL'
do
project
=
create
(
:project
,
:mirror
,
import_url:
'http://user:pass@test.com'
)
...
...
@@ -1834,14 +1833,6 @@ describe Project do
expect
(
project
.
reload
.
import_url
).
to
eq
(
'http://test.com'
)
end
=======
it
'returns the sanitized URL'
do
project
=
create
(
:project
,
:import_started
,
import_url:
'http://user:pass@test.com'
)
project
.
import_state
.
finish
expect
(
project
.
reload
.
import_url
).
to
eq
(
'http://test.com'
)
>>>>>>>
upstream
/
master
end
end
...
...
@@ -3732,7 +3723,6 @@ describe Project do
expect
(
project
.
wiki_repository_exists?
).
to
eq
(
true
)
end
<<<<<<<
HEAD
it
'returns false when the wiki repository does not exist'
do
project
=
create
(
:project
)
...
...
@@ -3754,8 +3744,6 @@ describe Project do
is_expected
.
to
eq
(
root_ancestor
)
end
end
=======
>>>>>>>
upstream
/
master
context
'when namespace is root ancestor'
do
let
(
:parent
)
{
build
(
:group
)
}
...
...
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