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
9599936c
Commit
9599936c
authored
Jul 18, 2019
by
Dan Davison
Committed by
Mark Lapierre
Jul 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor all existing usages of .act
Replace any occurance of .act with the preferred method .perform
parent
037096ef
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
29 additions
and
29 deletions
+29
-29
qa/qa/page/main/login.rb
qa/qa/page/main/login.rb
+3
-3
qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
...atures/browser_ui/1_manage/group/transfer_project_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
...a/specs/features/browser_ui/1_manage/login/log_in_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
...rowser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
...i/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
+2
-2
qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
...atures/browser_ui/1_manage/project/create_project_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
...es/browser_ui/1_manage/project/import_github_repo_spec.rb
+6
-6
qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
...cs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
...ecs/features/browser_ui/2_plan/issue/create_issue_spec.rb
+2
-2
qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
...res/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb
...atures/browser_ui/3_create/repository/add_ssh_key_spec.rb
+3
-3
qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
...create/repository/create_edit_delete_file_via_web_spec.rb
+2
-2
qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
...wser_ui/3_create/repository/push_protected_branch_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb
...atures/browser_ui/4_verify/runner/register_runner_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
...rowser_ui/6_release/deploy_token/add_deploy_token_spec.rb
+1
-1
qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
...gure/mattermost/create_group_with_mattermost_team_spec.rb
+2
-2
No files found.
qa/qa/page/main/login.rb
View file @
9599936c
...
@@ -44,7 +44,7 @@ module QA
...
@@ -44,7 +44,7 @@ module QA
def
sign_in_using_credentials
(
user
=
nil
)
def
sign_in_using_credentials
(
user
=
nil
)
# Don't try to log-in if we're already logged-in
# Don't try to log-in if we're already logged-in
return
if
Page
::
Main
::
Menu
.
act
{
has_personal_area?
(
wait:
0
)
}
return
if
Page
::
Main
::
Menu
.
perform
{
|
menu
|
menu
.
has_personal_area?
(
wait:
0
)
}
using_wait_time
0
do
using_wait_time
0
do
set_initial_password_if_present
set_initial_password_if_present
...
@@ -58,7 +58,7 @@ module QA
...
@@ -58,7 +58,7 @@ module QA
end
end
end
end
Page
::
Main
::
Menu
.
act
{
has_personal_area?
}
Page
::
Main
::
Menu
.
perform
(
&
:has_personal_area?
)
end
end
def
sign_in_using_admin_credentials
def
sign_in_using_admin_credentials
...
@@ -73,7 +73,7 @@ module QA
...
@@ -73,7 +73,7 @@ module QA
sign_in_using_gitlab_credentials
(
admin
)
sign_in_using_gitlab_credentials
(
admin
)
end
end
Page
::
Main
::
Menu
.
act
{
has_personal_area?
}
Page
::
Main
::
Menu
.
perform
(
&
:has_personal_area?
)
end
end
def
self
.
path
def
self
.
path
...
...
qa/qa/specs/features/browser_ui/1_manage/group/transfer_project_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'Project transfer between groups'
do
describe
'Project transfer between groups'
do
it
'user transfers a project between groups'
do
it
'user transfers a project between groups'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
source_group
=
Resource
::
Group
.
fabricate_via_api!
do
|
group
|
source_group
=
Resource
::
Group
.
fabricate_via_api!
do
|
group
|
group
.
path
=
'source-group'
group
.
path
=
'source-group'
...
...
qa/qa/specs/features/browser_ui/1_manage/login/log_in_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'basic user login'
do
describe
'basic user login'
do
it
'user logs in using basic credentials and logs out'
do
it
'user logs in using basic credentials and logs out'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Page
::
Main
::
Menu
.
perform
do
|
menu
|
Page
::
Main
::
Menu
.
perform
do
|
menu
|
expect
(
menu
).
to
have_personal_area
expect
(
menu
).
to
have_personal_area
...
...
qa/qa/specs/features/browser_ui/1_manage/login/log_into_gitlab_via_ldap_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'LDAP login'
do
describe
'LDAP login'
do
it
'user logs into GitLab using LDAP credentials'
do
it
'user logs into GitLab using LDAP credentials'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Page
::
Main
::
Menu
.
perform
do
|
menu
|
Page
::
Main
::
Menu
.
perform
do
|
menu
|
expect
(
menu
).
to
have_personal_area
expect
(
menu
).
to
have_personal_area
...
...
qa/qa/specs/features/browser_ui/1_manage/login/login_via_instance_wide_saml_sso_spec.rb
View file @
9599936c
...
@@ -6,9 +6,9 @@ module QA
...
@@ -6,9 +6,9 @@ module QA
it
'User logs in to gitlab with SAML SSO'
do
it
'User logs in to gitlab with SAML SSO'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_with_saml
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_with_saml
)
Vendor
::
SAMLIdp
::
Page
::
Login
.
act
{
login
}
Vendor
::
SAMLIdp
::
Page
::
Login
.
perform
(
&
:login
)
expect
(
page
).
to
have_content
(
'Welcome to GitLab'
)
expect
(
page
).
to
have_content
(
'Welcome to GitLab'
)
end
end
...
...
qa/qa/specs/features/browser_ui/1_manage/project/create_project_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'Project creation'
do
describe
'Project creation'
do
it
'user creates a new project'
do
it
'user creates a new project'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
created_project
=
Resource
::
Project
.
fabricate_via_browser_ui!
do
|
project
|
created_project
=
Resource
::
Project
.
fabricate_via_browser_ui!
do
|
project
|
project
.
name
=
'awesome-project'
project
.
name
=
'awesome-project'
...
...
qa/qa/specs/features/browser_ui/1_manage/project/import_github_repo_spec.rb
View file @
9599936c
...
@@ -24,16 +24,16 @@ module QA
...
@@ -24,16 +24,16 @@ module QA
it
'user imports a GitHub repo'
do
it
'user imports a GitHub repo'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
imported_project
# import the project
imported_project
# import the project
Page
::
Main
::
Menu
.
act
{
go_to_projects
}
Page
::
Main
::
Menu
.
perform
(
&
:go_to_projects
)
Page
::
Dashboard
::
Projects
.
perform
do
|
dashboard
|
Page
::
Dashboard
::
Projects
.
perform
do
|
dashboard
|
dashboard
.
go_to_project
(
imported_project
.
name
)
dashboard
.
go_to_project
(
imported_project
.
name
)
end
end
Page
::
Project
::
Show
.
act
{
wait_for_import
}
Page
::
Project
::
Show
.
perform
(
&
:wait_for_import
)
verify_repository_import
verify_repository_import
verify_issues_import
verify_issues_import
...
@@ -50,7 +50,7 @@ module QA
...
@@ -50,7 +50,7 @@ module QA
def
verify_issues_import
def
verify_issues_import
QA
::
Support
::
Retrier
.
retry_on_exception
do
QA
::
Support
::
Retrier
.
retry_on_exception
do
Page
::
Project
::
Menu
.
act
{
click_issues
}
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
expect
(
page
).
to
have_content
(
'This is a sample issue'
)
expect
(
page
).
to
have_content
(
'This is a sample issue'
)
click_link
'This is a sample issue'
click_link
'This is a sample issue'
...
@@ -73,7 +73,7 @@ module QA
...
@@ -73,7 +73,7 @@ module QA
end
end
def
verify_merge_requests_import
def
verify_merge_requests_import
Page
::
Project
::
Menu
.
act
{
click_merge_requests
}
Page
::
Project
::
Menu
.
perform
(
&
:click_merge_requests
)
expect
(
page
).
to
have_content
(
'Improve README.md'
)
expect
(
page
).
to
have_content
(
'Improve README.md'
)
click_link
'Improve README.md'
click_link
'Improve README.md'
...
@@ -108,7 +108,7 @@ module QA
...
@@ -108,7 +108,7 @@ module QA
end
end
def
verify_wiki_import
def
verify_wiki_import
Page
::
Project
::
Menu
.
act
{
click_wiki
}
Page
::
Project
::
Menu
.
perform
(
&
:click_wiki
)
expect
(
page
).
to
have_content
(
'Welcome to the test-project wiki!'
)
expect
(
page
).
to
have_content
(
'Welcome to the test-project wiki!'
)
end
end
...
...
qa/qa/specs/features/browser_ui/2_plan/issue/comment_issue_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'Issue comments'
do
describe
'Issue comments'
do
it
'user comments on an issue and edits the comment'
do
it
'user comments on an issue and edits the comment'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
.
title
=
'issue title'
issue
.
title
=
'issue title'
...
...
qa/qa/specs/features/browser_ui/2_plan/issue/create_issue_spec.rb
View file @
9599936c
...
@@ -8,7 +8,7 @@ module QA
...
@@ -8,7 +8,7 @@ module QA
it
'user creates an issue'
do
it
'user creates an issue'
do
create_issue
create_issue
Page
::
Project
::
Menu
.
act
{
click_issues
}
Page
::
Project
::
Menu
.
perform
(
&
:click_issues
)
expect
(
page
).
to
have_content
(
issue_title
)
expect
(
page
).
to
have_content
(
issue_title
)
end
end
...
@@ -39,7 +39,7 @@ module QA
...
@@ -39,7 +39,7 @@ module QA
def
create_issue
def
create_issue
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Resource
::
Issue
.
fabricate_via_browser_ui!
do
|
issue
|
Resource
::
Issue
.
fabricate_via_browser_ui!
do
|
issue
|
issue
.
title
=
issue_title
issue
.
title
=
issue_title
...
...
qa/qa/specs/features/browser_ui/2_plan/issue/filter_issue_comments_spec.rb
View file @
9599936c
...
@@ -7,7 +7,7 @@ module QA
...
@@ -7,7 +7,7 @@ module QA
it
'user filters comments and activities in an issue'
do
it
'user filters comments and activities in an issue'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
=
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
issue
.
title
=
issue_title
issue
.
title
=
issue_title
...
...
qa/qa/specs/features/browser_ui/3_create/repository/add_ssh_key_spec.rb
View file @
9599936c
...
@@ -7,7 +7,7 @@ module QA
...
@@ -7,7 +7,7 @@ module QA
it
'user adds and then removes an SSH key'
,
:smoke
do
it
'user adds and then removes an SSH key'
,
:smoke
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
key
=
Resource
::
SSHKey
.
fabricate!
do
|
resource
|
key
=
Resource
::
SSHKey
.
fabricate!
do
|
resource
|
resource
.
title
=
key_title
resource
.
title
=
key_title
...
@@ -16,8 +16,8 @@ module QA
...
@@ -16,8 +16,8 @@ module QA
expect
(
page
).
to
have_content
(
"Title:
#{
key_title
}
"
)
expect
(
page
).
to
have_content
(
"Title:
#{
key_title
}
"
)
expect
(
page
).
to
have_content
(
key
.
fingerprint
)
expect
(
page
).
to
have_content
(
key
.
fingerprint
)
Page
::
Main
::
Menu
.
act
{
click_settings_link
}
Page
::
Main
::
Menu
.
perform
(
&
:click_settings_link
)
Page
::
Profile
::
Menu
.
act
{
click_ssh_keys
}
Page
::
Profile
::
Menu
.
perform
(
&
:click_ssh_keys
)
Page
::
Profile
::
SSHKeys
.
perform
do
|
ssh_keys
|
Page
::
Profile
::
SSHKeys
.
perform
do
|
ssh_keys
|
ssh_keys
.
remove_key
(
key_title
)
ssh_keys
.
remove_key
(
key_title
)
...
...
qa/qa/specs/features/browser_ui/3_create/repository/create_edit_delete_file_via_web_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'Files management'
do
describe
'Files management'
do
it
'user creates, edits and deletes a file via the Web'
do
it
'user creates, edits and deletes a file via the Web'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
# Create
# Create
file_name
=
'QA Test - File name'
file_name
=
'QA Test - File name'
...
@@ -27,7 +27,7 @@ module QA
...
@@ -27,7 +27,7 @@ module QA
updated_file_content
=
'QA Test - Updated file content'
updated_file_content
=
'QA Test - Updated file content'
commit_message_for_update
=
'QA Test - Update file'
commit_message_for_update
=
'QA Test - Update file'
Page
::
File
::
Show
.
act
{
click_edit
}
Page
::
File
::
Show
.
perform
(
&
:click_edit
)
Page
::
File
::
Form
.
act
do
Page
::
File
::
Form
.
act
do
remove_content
remove_content
...
...
qa/qa/specs/features/browser_ui/3_create/repository/push_protected_branch_spec.rb
View file @
9599936c
...
@@ -13,7 +13,7 @@ module QA
...
@@ -13,7 +13,7 @@ module QA
before
do
before
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
end
end
after
do
after
do
...
...
qa/qa/specs/features/browser_ui/4_verify/runner/register_runner_spec.rb
View file @
9599936c
...
@@ -11,7 +11,7 @@ module QA
...
@@ -11,7 +11,7 @@ module QA
it
'user registers a new specific runner'
do
it
'user registers a new specific runner'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Resource
::
Runner
.
fabricate!
do
|
runner
|
Resource
::
Runner
.
fabricate!
do
|
runner
|
runner
.
name
=
executor
runner
.
name
=
executor
...
...
qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb
View file @
9599936c
...
@@ -5,7 +5,7 @@ module QA
...
@@ -5,7 +5,7 @@ module QA
describe
'Deploy token creation'
do
describe
'Deploy token creation'
do
it
'user adds a deploy token'
do
it
'user adds a deploy token'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
deploy_token_name
=
'deploy token name'
deploy_token_name
=
'deploy token name'
one_week_from_now
=
Date
.
today
+
7
one_week_from_now
=
Date
.
today
+
7
...
...
qa/qa/specs/features/browser_ui/7_configure/mattermost/create_group_with_mattermost_team_spec.rb
View file @
9599936c
...
@@ -5,8 +5,8 @@ module QA
...
@@ -5,8 +5,8 @@ module QA
describe
'Mattermost support'
do
describe
'Mattermost support'
do
it
'user creates a group with a mattermost team'
do
it
'user creates a group with a mattermost team'
do
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Runtime
::
Browser
.
visit
(
:gitlab
,
Page
::
Main
::
Login
)
Page
::
Main
::
Login
.
act
{
sign_in_using_credentials
}
Page
::
Main
::
Login
.
perform
(
&
:sign_in_using_credentials
)
Page
::
Main
::
Menu
.
act
{
go_to_groups
}
Page
::
Main
::
Menu
.
perform
(
&
:go_to_groups
)
Page
::
Dashboard
::
Groups
.
perform
do
|
page
|
Page
::
Dashboard
::
Groups
.
perform
do
|
page
|
page
.
click_new_group
page
.
click_new_group
...
...
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