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
7a9fc480
Commit
7a9fc480
authored
Dec 15, 2011
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
just test fix commit
parent
d9cfb798
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
13 deletions
+12
-13
spec/factories.rb
spec/factories.rb
+1
-0
spec/requests/dashboard_issues_spec.rb
spec/requests/dashboard_issues_spec.rb
+2
-3
spec/requests/dashboard_merge_requests_spec.rb
spec/requests/dashboard_merge_requests_spec.rb
+4
-5
spec/requests/projects_spec.rb
spec/requests/projects_spec.rb
+2
-2
spec/requests/snippets_spec.rb
spec/requests/snippets_spec.rb
+3
-3
No files found.
spec/factories.rb
View file @
7a9fc480
...
@@ -38,6 +38,7 @@ Factory.add(:merge_request, MergeRequest) do |obj|
...
@@ -38,6 +38,7 @@ Factory.add(:merge_request, MergeRequest) do |obj|
obj
.
title
=
Faker
::
Lorem
.
sentence
obj
.
title
=
Faker
::
Lorem
.
sentence
obj
.
source_branch
=
"master"
obj
.
source_branch
=
"master"
obj
.
target_branch
=
"master"
obj
.
target_branch
=
"master"
obj
.
closed
=
false
end
end
Factory
.
add
(
:snippet
,
Snippet
)
do
|
obj
|
Factory
.
add
(
:snippet
,
Snippet
)
do
|
obj
|
...
...
spec/requests/dashboard_issues_spec.rb
View file @
7a9fc480
require
'spec_helper'
require
'spec_helper'
describe
"User Issues Dashboard"
,
:js
=>
true
do
describe
"User Issues Dashboard"
do
describe
"GET /issues"
do
describe
"GET /issues"
do
before
do
before
do
...
@@ -27,8 +27,7 @@ describe "User Issues Dashboard", :js => true do
...
@@ -27,8 +27,7 @@ describe "User Issues Dashboard", :js => true do
:assignee
=>
@user
,
:assignee
=>
@user
,
:project
=>
@project2
:project
=>
@project2
visit
dashboard_path
visit
dashboard_issues_path
click_link
"issues_slide"
end
end
subject
{
page
}
subject
{
page
}
...
...
spec/requests/dashboard_merge_requests_spec.rb
View file @
7a9fc480
require
'spec_helper'
require
'spec_helper'
describe
"User MergeRequests"
,
:js
=>
true
do
describe
"User MergeRequests"
do
describe
"GET /issues"
do
describe
"GET /issues"
do
before
do
before
do
...
@@ -27,19 +27,18 @@ describe "User MergeRequests", :js => true do
...
@@ -27,19 +27,18 @@ describe "User MergeRequests", :js => true do
:assignee
=>
@user
,
:assignee
=>
@user
,
:project
=>
@project2
:project
=>
@project2
visit
dashboard_path
visit
dashboard_merge_requests_path
click_link
"merge_requests_slide"
end
end
subject
{
page
}
subject
{
page
}
it
{
should
have_content
(
@merge_request1
.
title
)
}
it
{
should
have_content
(
@merge_request1
.
title
[
0
..
10
]
)
}
it
{
should
have_content
(
@merge_request1
.
project
.
name
)
}
it
{
should
have_content
(
@merge_request1
.
project
.
name
)
}
it
{
should
have_content
(
@merge_request1
.
target_branch
)
}
it
{
should
have_content
(
@merge_request1
.
target_branch
)
}
it
{
should
have_content
(
@merge_request1
.
source_branch
)
}
it
{
should
have_content
(
@merge_request1
.
source_branch
)
}
it
{
should
have_content
(
@merge_request1
.
assignee
.
name
)
}
it
{
should
have_content
(
@merge_request1
.
assignee
.
name
)
}
it
{
should
have_content
(
@merge_request2
.
title
)
}
it
{
should
have_content
(
@merge_request2
.
title
[
0
..
10
]
)
}
it
{
should
have_content
(
@merge_request2
.
project
.
name
)
}
it
{
should
have_content
(
@merge_request2
.
project
.
name
)
}
it
{
should
have_content
(
@merge_request2
.
target_branch
)
}
it
{
should
have_content
(
@merge_request2
.
target_branch
)
}
it
{
should
have_content
(
@merge_request2
.
source_branch
)
}
it
{
should
have_content
(
@merge_request2
.
source_branch
)
}
...
...
spec/requests/projects_spec.rb
View file @
7a9fc480
...
@@ -46,7 +46,7 @@ describe "Projects" do
...
@@ -46,7 +46,7 @@ describe "Projects" do
fill_in
'Name'
,
:with
=>
'NewProject'
fill_in
'Name'
,
:with
=>
'NewProject'
fill_in
'Code'
,
:with
=>
'NPR'
fill_in
'Code'
,
:with
=>
'NPR'
fill_in
'Path'
,
:with
=>
'newproject'
fill_in
'Path'
,
:with
=>
'newproject'
expect
{
click_button
"
Create Project
"
}.
to
change
{
Project
.
count
}.
by
(
1
)
expect
{
click_button
"
Save
"
}.
to
change
{
Project
.
count
}.
by
(
1
)
@project
=
Project
.
last
@project
=
Project
.
last
end
end
...
@@ -135,7 +135,7 @@ describe "Projects" do
...
@@ -135,7 +135,7 @@ describe "Projects" do
fill_in
'Name'
,
:with
=>
'Awesome'
fill_in
'Name'
,
:with
=>
'Awesome'
fill_in
'Path'
,
:with
=>
'legit'
fill_in
'Path'
,
:with
=>
'legit'
fill_in
'Description'
,
:with
=>
'Awesome project'
fill_in
'Description'
,
:with
=>
'Awesome project'
click_button
"
Update Project
"
click_button
"
Save
"
@project
=
@project
.
reload
@project
=
@project
.
reload
end
end
...
...
spec/requests/snippets_spec.rb
View file @
7a9fc480
...
@@ -28,7 +28,7 @@ describe "Snippets" do
...
@@ -28,7 +28,7 @@ describe "Snippets" do
# admin access to remove snippet
# admin access to remove snippet
@user
.
users_projects
.
destroy_all
@user
.
users_projects
.
destroy_all
project
.
add_access
(
@user
,
:read
,
:write
,
:admin
)
project
.
add_access
(
@user
,
:read
,
:write
,
:admin
)
visit
project_snippets_path
(
projec
t
)
visit
edit_project_snippet_path
(
project
,
@snippe
t
)
end
end
it
"should remove entry"
do
it
"should remove entry"
do
...
@@ -72,8 +72,8 @@ describe "Snippets" do
...
@@ -72,8 +72,8 @@ describe "Snippets" do
@snippet
=
Factory
:snippet
,
@snippet
=
Factory
:snippet
,
:author
=>
@user
,
:author
=>
@user
,
:project
=>
project
:project
=>
project
visit
project_snippet
s_path
(
projec
t
)
visit
project_snippet
_path
(
project
,
@snippe
t
)
click_link
"Edit"
click_link
"Edit
Snippet
"
end
end
it
"should open edit page"
do
it
"should open edit page"
do
...
...
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