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
Tatuya Kamada
gitlab-ce
Commits
a0755d2f
Commit
a0755d2f
authored
Aug 07, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix tests
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
fe228b89
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
158 additions
and
156 deletions
+158
-156
spec/controllers/blob_controller_spec.rb
spec/controllers/blob_controller_spec.rb
+2
-2
spec/controllers/tree_controller_spec.rb
spec/controllers/tree_controller_spec.rb
+2
-2
spec/features/notes_on_merge_requests_spec.rb
spec/features/notes_on_merge_requests_spec.rb
+151
-139
spec/models/project_wiki_spec.rb
spec/models/project_wiki_spec.rb
+3
-13
No files found.
spec/controllers/blob_controller_spec.rb
View file @
a0755d2f
...
...
@@ -44,8 +44,8 @@ describe Projects::BlobController do
end
context
'redirect to tree'
do
let
(
:id
)
{
'ma
ster
/doc'
}
it
{
should
redirect_to
(
"/
#{
project
.
path_with_namespace
}
/tree/ma
ster
/doc"
)
}
let
(
:id
)
{
'ma
rkdown
/doc'
}
it
{
should
redirect_to
(
"/
#{
project
.
path_with_namespace
}
/tree/ma
rkdown
/doc"
)
}
end
end
end
spec/controllers/tree_controller_spec.rb
View file @
a0755d2f
...
...
@@ -26,7 +26,7 @@ describe Projects::TreeController do
end
context
"valid branch, valid path"
do
let
(
:id
)
{
'master/
app
/'
}
let
(
:id
)
{
'master/
encoding
/'
}
it
{
should
respond_with
(
:success
)
}
end
...
...
@@ -36,7 +36,7 @@ describe Projects::TreeController do
end
context
"invalid branch, valid path"
do
let
(
:id
)
{
'invalid-branch/
app
/'
}
let
(
:id
)
{
'invalid-branch/
encoding
/'
}
it
{
should
respond_with
(
:not_found
)
}
end
end
...
...
spec/features/notes_on_merge_requests_spec.rb
View file @
a0755d2f
This diff is collapsed.
Click to expand it.
spec/models/project_wiki_spec.rb
View file @
a0755d2f
...
...
@@ -41,23 +41,13 @@ describe ProjectWiki do
subject
.
wiki
.
should
be_a
Gollum
::
Wiki
end
before
do
Gitlab
::
Shell
.
any_instance
.
stub
(
:add_repository
)
do
create_temp_repo
(
"
#{
Rails
.
root
}
/tmp/test-git-base-path/non-existant.wiki.git"
)
end
project
.
stub
(
:path_with_namespace
).
and_return
(
"non-existant"
)
end
it
"creates a new wiki repo if one does not yet exist"
do
wiki
=
ProjectWiki
.
new
(
project
,
user
)
wiki
.
create_page
(
"index"
,
"test content"
).
should_not
==
false
FileUtils
.
rm_rf
wiki
.
send
(
:path_to_repo
)
project_wiki
.
create_page
(
"index"
,
"test content"
).
should
be_true
end
it
"raises CouldNotCreateWikiError if it can't create the wiki repository"
do
ProjectWiki
.
any_instance
.
stub
(
:init_repo
).
and_return
(
false
)
expect
{
ProjectWiki
.
new
(
project
,
user
).
wiki
}.
to
raise_exception
(
ProjectWiki
::
CouldNotCreateWikiError
)
project_wiki
.
stub
(
:init_repo
).
and_return
(
false
)
expect
{
project_wiki
.
send
(
:create_repo!
)
}.
to
raise_exception
(
ProjectWiki
::
CouldNotCreateWikiError
)
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