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
963e6366
Commit
963e6366
authored
Oct 03, 2015
by
Guilherme Garnier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop warnings in features
parent
aed145a9
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
33 additions
and
35 deletions
+33
-35
features/steps/groups.rb
features/steps/groups.rb
+25
-25
features/steps/project/graph.rb
features/steps/project/graph.rb
+1
-1
features/steps/project/issues/issues.rb
features/steps/project/issues/issues.rb
+2
-2
features/steps/project/redirects.rb
features/steps/project/redirects.rb
+0
-2
features/steps/shared/group.rb
features/steps/shared/group.rb
+1
-1
spec/features/ci/admin/builds_spec.rb
spec/features/ci/admin/builds_spec.rb
+4
-4
No files found.
features/steps/groups.rb
View file @
963e6366
...
...
@@ -282,9 +282,9 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
milestone1_project2
=
create
:milestone
,
title:
"Version 7.2"
,
project:
project2
milestone1_project3
=
create
:milestone
,
title:
"Version 7.2"
,
project:
@project3
create
:milestone
,
title:
"Version 7.2"
,
project:
@project3
milestone2_project1
=
create
:milestone
,
title:
"GL-113"
,
project:
@project1
...
...
@@ -301,28 +301,28 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
assignee:
current_user
,
author:
current_user
,
milestone:
milestone2_project1
issue2
=
create
:issue
,
project:
project2
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone1_project2
issue3
=
create
:issue
,
project:
@project3
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone1_project1
mr1
=
create
:merge_request
,
source_project:
@project1
,
target_project:
@project1
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone2_project1
mr2
=
create
:merge_request
,
source_project:
project2
,
target_project:
project2
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone2_project2
create
:issue
,
project:
project2
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone1_project2
create
:issue
,
project:
@project3
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone1_project1
create
:merge_request
,
source_project:
@project1
,
target_project:
@project1
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone2_project1
create
:merge_request
,
source_project:
project2
,
target_project:
project2
,
assignee:
current_user
,
author:
current_user
,
milestone:
milestone2_project2
@mr3
=
create
:merge_request
,
source_project:
@project3
,
target_project:
@project3
,
...
...
features/steps/project/graph.rb
View file @
963e6366
...
...
@@ -32,6 +32,6 @@ class Spinach::Features::ProjectGraph < Spinach::FeatureSteps
end
def
project
project
||=
Project
.
find_by
(
name:
"Shop"
)
@
project
||=
Project
.
find_by
(
name:
"Shop"
)
end
end
features/steps/project/issues/issues.rb
View file @
963e6366
...
...
@@ -223,11 +223,11 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
end
step
'project \'Shop\' has issue \'Bugfix1\' with description: \'Description for issue1\''
do
issue
=
create
(
:issue
,
title:
'Bugfix1'
,
description:
'Description for issue1'
,
project:
project
)
create
(
:issue
,
title:
'Bugfix1'
,
description:
'Description for issue1'
,
project:
project
)
end
step
'project \'Shop\' has issue \'Feature1\' with description: \'Feature submitted for issue1\''
do
issue
=
create
(
:issue
,
title:
'Feature1'
,
description:
'Feature submitted for issue1'
,
project:
project
)
create
(
:issue
,
title:
'Feature1'
,
description:
'Feature submitted for issue1'
,
project:
project
)
end
step
'I fill in issue search with \'Description for issue1\''
do
...
...
features/steps/project/redirects.rb
View file @
963e6366
...
...
@@ -39,7 +39,6 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
step
'Authenticate'
do
admin
=
create
(
:admin
)
project
=
Project
.
find_by
(
name:
'Community'
)
fill_in
"user_login"
,
with:
admin
.
email
fill_in
"user_password"
,
with:
admin
.
password
click_button
"Sign in"
...
...
@@ -54,7 +53,6 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
step
'I get redirected to signin page where I sign in'
do
admin
=
create
(
:admin
)
project
=
Project
.
find_by
(
name:
'Enterprise'
)
fill_in
"user_login"
,
with:
admin
.
email
fill_in
"user_password"
,
with:
admin
.
password
click_button
"Sign in"
...
...
features/steps/shared/group.rb
View file @
963e6366
...
...
@@ -37,7 +37,7 @@ module SharedGroup
group
=
Group
.
find_by
(
name:
groupname
)
||
create
(
:group
,
name:
groupname
)
group
.
add_user
(
user
,
role
)
project
||=
create
(
:project
,
namespace:
group
,
path:
"project
#{
@project_count
}
"
)
event
||=
create
(
:closed_issue_event
,
project:
project
)
create
(
:closed_issue_event
,
project:
project
)
project
.
team
<<
[
user
,
:master
]
@project_count
+=
1
end
...
...
spec/features/ci/admin/builds_spec.rb
View file @
963e6366
...
...
@@ -21,10 +21,10 @@ describe "Admin Builds" do
describe
"Tabs"
do
it
"shows all builds"
do
build
=
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"pending"
build1
=
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"running"
build2
=
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"success"
build3
=
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"failed"
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"pending"
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"running"
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"success"
FactoryGirl
.
create
:ci_build
,
commit:
commit
,
status:
"failed"
visit
ci_admin_builds_path
...
...
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