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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
fd522b32
Commit
fd522b32
authored
Jan 15, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
should be green build now :)
parent
cc54c66f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
spec/controllers/merge_requests_controller_spec.rb
spec/controllers/merge_requests_controller_spec.rb
+1
-1
spec/requests/gitlab_flavored_markdown_spec.rb
spec/requests/gitlab_flavored_markdown_spec.rb
+8
-7
No files found.
spec/controllers/merge_requests_controller_spec.rb
View file @
fd522b32
...
@@ -3,7 +3,7 @@ require 'spec_helper'
...
@@ -3,7 +3,7 @@ require 'spec_helper'
describe
MergeRequestsController
do
describe
MergeRequestsController
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:project
)
{
create
(
:project
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request_with_diffs
,
project:
project
)
}
let
(
:merge_request
)
{
create
(
:merge_request_with_diffs
,
project:
project
,
target_branch:
"bcf03b5d~3"
,
source_branch:
"bcf03b5d"
)
}
before
do
before
do
sign_in
(
user
)
sign_in
(
user
)
...
...
spec/requests/gitlab_flavored_markdown_spec.rb
View file @
fd522b32
...
@@ -67,13 +67,14 @@ describe "Gitlab Flavored Markdown" do
...
@@ -67,13 +67,14 @@ describe "Gitlab Flavored Markdown" do
end
end
end
end
it
"should render title in refs#blame"
do
# @wip
visit
project_blame_path
(
project
,
File
.
join
(
@branch_name
,
@test_file
))
#it "should render title in refs#blame" do
#visit project_blame_path(project, File.join(@branch_name, @test_file))
within
(
".blame_commit"
)
do
page
.
should
have_link
(
"#
#{
issue
.
id
}
"
)
#within(".blame_commit") do
end
#page.should have_link("##{issue.id}")
end
#end
#end
it
"should render title in repositories#branches"
do
it
"should render title in repositories#branches"
do
visit
branches_project_repository_path
(
project
)
visit
branches_project_repository_path
(
project
)
...
...
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