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
f167f37e
Commit
f167f37e
authored
Jun 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop issues at feature/ directory
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
770eba73
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
35 additions
and
37 deletions
+35
-37
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+1
-1
features/steps/dashboard/event_filters.rb
features/steps/dashboard/event_filters.rb
+1
-1
features/steps/explore/projects.rb
features/steps/explore/projects.rb
+0
-1
features/steps/project/snippets.rb
features/steps/project/snippets.rb
+3
-3
features/steps/shared/admin.rb
features/steps/shared/admin.rb
+0
-1
features/steps/shared/issuable.rb
features/steps/shared/issuable.rb
+1
-1
features/steps/shared/paths.rb
features/steps/shared/paths.rb
+20
-20
features/steps/shared/user.rb
features/steps/shared/user.rb
+3
-3
features/steps/snippets/snippets.rb
features/steps/snippets/snippets.rb
+6
-6
No files found.
features/steps/dashboard/dashboard.rb
View file @
f167f37e
...
@@ -28,7 +28,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
...
@@ -28,7 +28,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
end
end
step
'user with name "John Doe" joined project "Shop"'
do
step
'user with name "John Doe" joined project "Shop"'
do
user
=
create
(
:user
,
{
name:
"John Doe"
})
user
=
create
(
:user
,
{
name:
"John Doe"
})
project
.
team
<<
[
user
,
:master
]
project
.
team
<<
[
user
,
:master
]
Event
.
create
(
Event
.
create
(
project:
project
,
project:
project
,
...
...
features/steps/dashboard/event_filters.rb
View file @
f167f37e
...
@@ -52,7 +52,7 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
...
@@ -52,7 +52,7 @@ class Spinach::Features::EventFilters < Spinach::FeatureSteps
end
end
step
'this project has new member event'
do
step
'this project has new member event'
do
user
=
create
(
:user
,
{
name:
"John Doe"
})
user
=
create
(
:user
,
{
name:
"John Doe"
})
Event
.
create
(
Event
.
create
(
project:
@project
,
project:
@project
,
author_id:
user
.
id
,
author_id:
user
.
id
,
...
...
features/steps/explore/projects.rb
View file @
f167f37e
...
@@ -145,4 +145,3 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
...
@@ -145,4 +145,3 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
@public_merge_request
||=
MergeRequest
.
find_by!
(
title:
'Bug fix for public project'
)
@public_merge_request
||=
MergeRequest
.
find_by!
(
title:
'Bug fix for public project'
)
end
end
end
end
features/steps/project/snippets.rb
View file @
f167f37e
...
@@ -52,8 +52,8 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
...
@@ -52,8 +52,8 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
end
step
'I submit new snippet "Snippet three"'
do
step
'I submit new snippet "Snippet three"'
do
fill_in
"project_snippet_title"
,
:with
=>
"Snippet three"
fill_in
"project_snippet_title"
,
with:
"Snippet three"
fill_in
"project_snippet_file_name"
,
:with
=>
"my_snippet.rb"
fill_in
"project_snippet_file_name"
,
with:
"my_snippet.rb"
page
.
within
(
'.file-editor'
)
do
page
.
within
(
'.file-editor'
)
do
find
(
:xpath
,
"//input[@id='project_snippet_content']"
).
set
'Content of snippet three'
find
(
:xpath
,
"//input[@id='project_snippet_content']"
).
set
'Content of snippet three'
end
end
...
@@ -66,7 +66,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
...
@@ -66,7 +66,7 @@ class Spinach::Features::ProjectSnippets < Spinach::FeatureSteps
end
end
step
'I submit new title "Snippet new title"'
do
step
'I submit new title "Snippet new title"'
do
fill_in
"project_snippet_title"
,
:with
=>
"Snippet new title"
fill_in
"project_snippet_title"
,
with:
"Snippet new title"
click_button
"Save"
click_button
"Save"
end
end
...
...
features/steps/shared/admin.rb
View file @
f167f37e
...
@@ -9,4 +9,3 @@ module SharedAdmin
...
@@ -9,4 +9,3 @@ module SharedAdmin
2
.
times
{
create
(
:user
)
}
2
.
times
{
create
(
:user
)
}
end
end
end
end
features/steps/shared/issuable.rb
View file @
f167f37e
...
@@ -2,7 +2,7 @@ module SharedIssuable
...
@@ -2,7 +2,7 @@ module SharedIssuable
include
Spinach
::
DSL
include
Spinach
::
DSL
def
edit_issuable
def
edit_issuable
find
(
:css
,
'.issuable-edit'
).
click
find
(
:css
,
'.issuable-edit'
).
click
end
end
step
'I click link "Edit" for the merge request'
do
step
'I click link "Edit" for the merge request'
do
...
...
features/steps/shared/paths.rb
View file @
f167f37e
...
@@ -20,43 +20,43 @@ module SharedPaths
...
@@ -20,43 +20,43 @@ module SharedPaths
# ----------------------------------------
# ----------------------------------------
step
'I visit group "Owned" page'
do
step
'I visit group "Owned" page'
do
visit
group_path
(
Group
.
find_by
(
name
:"Owned"
))
visit
group_path
(
Group
.
find_by
(
name:
"Owned"
))
end
end
step
'I visit group "Owned" issues page'
do
step
'I visit group "Owned" issues page'
do
visit
issues_group_path
(
Group
.
find_by
(
name
:"Owned"
))
visit
issues_group_path
(
Group
.
find_by
(
name:
"Owned"
))
end
end
step
'I visit group "Owned" merge requests page'
do
step
'I visit group "Owned" merge requests page'
do
visit
merge_requests_group_path
(
Group
.
find_by
(
name
:"Owned"
))
visit
merge_requests_group_path
(
Group
.
find_by
(
name:
"Owned"
))
end
end
step
'I visit group "Owned" members page'
do
step
'I visit group "Owned" members page'
do
visit
group_group_members_path
(
Group
.
find_by
(
name
:"Owned"
))
visit
group_group_members_path
(
Group
.
find_by
(
name:
"Owned"
))
end
end
step
'I visit group "Owned" settings page'
do
step
'I visit group "Owned" settings page'
do
visit
edit_group_path
(
Group
.
find_by
(
name
:"Owned"
))
visit
edit_group_path
(
Group
.
find_by
(
name:
"Owned"
))
end
end
step
'I visit group "Guest" page'
do
step
'I visit group "Guest" page'
do
visit
group_path
(
Group
.
find_by
(
name
:"Guest"
))
visit
group_path
(
Group
.
find_by
(
name:
"Guest"
))
end
end
step
'I visit group "Guest" issues page'
do
step
'I visit group "Guest" issues page'
do
visit
issues_group_path
(
Group
.
find_by
(
name
:"Guest"
))
visit
issues_group_path
(
Group
.
find_by
(
name:
"Guest"
))
end
end
step
'I visit group "Guest" merge requests page'
do
step
'I visit group "Guest" merge requests page'
do
visit
merge_requests_group_path
(
Group
.
find_by
(
name
:"Guest"
))
visit
merge_requests_group_path
(
Group
.
find_by
(
name:
"Guest"
))
end
end
step
'I visit group "Guest" members page'
do
step
'I visit group "Guest" members page'
do
visit
group_group_members_path
(
Group
.
find_by
(
name
:"Guest"
))
visit
group_group_members_path
(
Group
.
find_by
(
name:
"Guest"
))
end
end
step
'I visit group "Guest" settings page'
do
step
'I visit group "Guest" settings page'
do
visit
edit_group_path
(
Group
.
find_by
(
name
:"Guest"
))
visit
edit_group_path
(
Group
.
find_by
(
name:
"Guest"
))
end
end
# ----------------------------------------
# ----------------------------------------
...
@@ -201,11 +201,11 @@ module SharedPaths
...
@@ -201,11 +201,11 @@ module SharedPaths
end
end
step
"I visit my project's commits page"
do
step
"I visit my project's commits page"
do
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
,
{
limit:
5
})
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
,
{
limit:
5
})
end
end
step
"I visit my project's commits page for a specific path"
do
step
"I visit my project's commits page for a specific path"
do
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
+
"/app/models/project.rb"
,
{
limit:
5
})
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
+
"/app/models/project.rb"
,
{
limit:
5
})
end
end
step
'I visit my project\'s commits stats page'
do
step
'I visit my project\'s commits stats page'
do
...
@@ -272,11 +272,11 @@ module SharedPaths
...
@@ -272,11 +272,11 @@ module SharedPaths
end
end
step
'I visit project commits page'
do
step
'I visit project commits page'
do
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
,
{
limit:
5
})
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
root_ref
,
{
limit:
5
})
end
end
step
'I visit project commits page for stable branch'
do
step
'I visit project commits page for stable branch'
do
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
'stable'
,
{
limit:
5
})
visit
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
'stable'
,
{
limit:
5
})
end
end
step
'I visit project source page'
do
step
'I visit project source page'
do
...
@@ -418,13 +418,13 @@ module SharedPaths
...
@@ -418,13 +418,13 @@ module SharedPaths
visit
explore_projects_path
visit
explore_projects_path
end
end
step
'I visit the explore trending projects'
do
step
'I visit the explore trending projects'
do
visit
trending_explore_projects_path
visit
trending_explore_projects_path
end
end
step
'I visit the explore starred projects'
do
step
'I visit the explore starred projects'
do
visit
starred_explore_projects_path
visit
starred_explore_projects_path
end
end
step
'I visit the public groups area'
do
step
'I visit the public groups area'
do
visit
explore_groups_path
visit
explore_groups_path
...
...
features/steps/shared/user.rb
View file @
f167f37e
...
@@ -2,16 +2,16 @@ module SharedUser
...
@@ -2,16 +2,16 @@ module SharedUser
include
Spinach
::
DSL
include
Spinach
::
DSL
step
'User "John Doe" exists'
do
step
'User "John Doe" exists'
do
user_exists
(
"John Doe"
,
{
username:
"john_doe"
})
user_exists
(
"John Doe"
,
{
username:
"john_doe"
})
end
end
step
'User "Mary Jane" exists'
do
step
'User "Mary Jane" exists'
do
user_exists
(
"Mary Jane"
,
{
username:
"mary_jane"
})
user_exists
(
"Mary Jane"
,
{
username:
"mary_jane"
})
end
end
protected
protected
def
user_exists
(
name
,
options
=
{})
def
user_exists
(
name
,
options
=
{})
User
.
find_by
(
name:
name
)
||
create
(
:user
,
{
name:
name
,
admin:
false
}.
merge
(
options
))
User
.
find_by
(
name:
name
)
||
create
(
:user
,
{
name:
name
,
admin:
false
}.
merge
(
options
))
end
end
end
end
features/steps/snippets/snippets.rb
View file @
f167f37e
...
@@ -23,8 +23,8 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
...
@@ -23,8 +23,8 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
end
step
'I submit new snippet "Personal snippet three"'
do
step
'I submit new snippet "Personal snippet three"'
do
fill_in
"personal_snippet_title"
,
:with
=>
"Personal snippet three"
fill_in
"personal_snippet_title"
,
with:
"Personal snippet three"
fill_in
"personal_snippet_file_name"
,
:with
=>
"my_snippet.rb"
fill_in
"personal_snippet_file_name"
,
with:
"my_snippet.rb"
page
.
within
(
'.file-editor'
)
do
page
.
within
(
'.file-editor'
)
do
find
(
:xpath
,
"//input[@id='personal_snippet_content']"
).
set
'Content of snippet three'
find
(
:xpath
,
"//input[@id='personal_snippet_content']"
).
set
'Content of snippet three'
end
end
...
@@ -32,12 +32,12 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
...
@@ -32,12 +32,12 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
end
step
'I submit new internal snippet'
do
step
'I submit new internal snippet'
do
fill_in
"personal_snippet_title"
,
:with
=>
"Internal personal snippet one"
fill_in
"personal_snippet_title"
,
with:
"Internal personal snippet one"
fill_in
"personal_snippet_file_name"
,
:with
=>
"my_snippet.rb"
fill_in
"personal_snippet_file_name"
,
with:
"my_snippet.rb"
choose
'personal_snippet_visibility_level_10'
choose
'personal_snippet_visibility_level_10'
page
.
within
(
'.file-editor'
)
do
page
.
within
(
'.file-editor'
)
do
find
(
:xpath
,
"//input[@id='personal_snippet_content']"
).
set
'Content of internal snippet'
find
(
:xpath
,
"//input[@id='personal_snippet_content']"
).
set
'Content of internal snippet'
end
end
click_button
"Create snippet"
click_button
"Create snippet"
...
@@ -49,7 +49,7 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
...
@@ -49,7 +49,7 @@ class Spinach::Features::Snippets < Spinach::FeatureSteps
end
end
step
'I submit new title "Personal snippet new title"'
do
step
'I submit new title "Personal snippet new title"'
do
fill_in
"personal_snippet_title"
,
:with
=>
"Personal snippet new title"
fill_in
"personal_snippet_title"
,
with:
"Personal snippet new title"
click_button
"Save"
click_button
"Save"
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