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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
57254bf8
Commit
57254bf8
authored
Mar 09, 2022
by
Valerie Burton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply review suggestions for using dynamic element and existing users
parent
9f9a82af
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
38 additions
and
32 deletions
+38
-32
app/assets/javascripts/issues/show/components/delete_issue_modal.vue
...javascripts/issues/show/components/delete_issue_modal.vue
+4
-1
qa/qa/page/dashboard/projects.rb
qa/qa/page/dashboard/projects.rb
+6
-8
qa/qa/page/modal/delete_issue.rb
qa/qa/page/modal/delete_issue.rb
+17
-0
qa/qa/page/project/issue/show.rb
qa/qa/page/project/issue/show.rb
+3
-2
qa/qa/specs/features/browser_ui/1_manage/project/personal_project_permissions_spec.rb
..._ui/1_manage/project/personal_project_permissions_spec.rb
+8
-21
No files found.
app/assets/javascripts/issues/show/components/delete_issue_modal.vue
View file @
57254bf8
...
...
@@ -31,7 +31,10 @@ export default {
computed
:
{
actionPrimary
()
{
return
{
attributes
:
{
variant
:
'
danger
'
},
attributes
:
{
variant
:
'
danger
'
,
'
data-qa-selector
'
:
'
confirm_delete_issue_button
'
},
text
:
this
.
title
,
};
},
...
...
qa/qa/page/dashboard/projects.rb
View file @
57254bf8
...
...
@@ -23,6 +23,12 @@ module QA
end
end
def
filter_by_name
(
name
)
within_element
(
:project_filter_form
)
do
fill_in
:name
,
with:
name
end
end
def
go_to_project
(
name
)
filter_by_name
(
name
)
...
...
@@ -40,14 +46,6 @@ module QA
def
clear_project_filter
fill_element
(
:project_filter_form
,
""
)
end
private
def
filter_by_name
(
name
)
within_element
(
:project_filter_form
)
do
fill_in
:name
,
with:
name
end
end
end
end
end
...
...
qa/qa/page/modal/delete_issue.rb
0 → 100644
View file @
57254bf8
# frozen_string_literal: true
module
QA
module
Page
module
Modal
class
DeleteIssue
<
Base
view
'app/assets/javascripts/issues/show/components/delete_issue_modal.vue'
do
element
:confirm_delete_issue_button
,
required:
true
end
def
confirm_delete_issue
click_element
:confirm_delete_issue_button
end
end
end
end
end
qa/qa/page/project/issue/show.rb
View file @
57254bf8
...
...
@@ -79,9 +79,10 @@ module QA
def
delete_issue
click_element
(
:issue_actions_ellipsis_dropdown
)
click_element
(
:delete_issue_button
)
click_element
(
:delete_issue_button
,
Page
::
Modal
::
DeleteIssue
)
Page
::
Modal
::
DeleteIssue
.
perform
(
&
:confirm_delete_issue
)
within
(
'.modal-content'
)
{
click_button
'Delete issue'
}
wait_for_requests
end
end
...
...
qa/qa/specs/features/browser_ui/1_manage/project/personal_project_permissions_spec.rb
View file @
57254bf8
# frozen_string_literal: true
module
QA
RSpec
.
describe
'Manage'
,
:requires_admin
do
RSpec
.
describe
'Manage'
do
describe
'Personal project permissions'
do
let!
(
:admin_api_client
)
{
Runtime
::
API
::
Client
.
as_admin
}
let!
(
:owner
)
do
Resource
::
User
.
fabricate_via_api!
do
|
user
|
user
.
api_client
=
admin_api_client
end
end
let!
(
:owner
)
{
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_1
,
Runtime
::
Env
.
gitlab_qa_password_1
)
}
let!
(
:owner_api_client
)
{
Runtime
::
API
::
Client
.
new
(
:gitlab
,
user:
owner
)
}
...
...
@@ -23,7 +17,6 @@ module QA
after
do
project
&
.
remove_via_api!
owner
&
.
remove_via_api!
end
context
'when user is added as Owner'
do
...
...
@@ -41,6 +34,8 @@ module QA
it
"has Owner role with Owner permissions"
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352542'
do
Page
::
Dashboard
::
Projects
.
perform
do
|
projects
|
projects
.
filter_by_name
(
project
.
name
)
expect
(
projects
).
to
have_project_with_access_role
(
project
.
name
,
'Owner'
)
end
...
...
@@ -49,11 +44,7 @@ module QA
end
context
'when user is added as Maintainer'
do
let
(
:maintainer
)
do
Resource
::
User
.
fabricate_via_api!
do
|
user
|
user
.
api_client
=
admin_api_client
end
end
let
(
:maintainer
)
{
Resource
::
User
.
fabricate_or_use
(
Runtime
::
Env
.
gitlab_qa_username_2
,
Runtime
::
Env
.
gitlab_qa_password_2
)
}
let
(
:issue
)
do
Resource
::
Issue
.
fabricate_via_api!
do
|
issue
|
...
...
@@ -68,12 +59,10 @@ module QA
Flow
::
Login
.
sign_in
(
as:
maintainer
)
end
after
do
maintainer
&
.
remove_via_api!
end
it
"has Maintainer role without Owner permissions"
,
testcase:
'https://gitlab.com/gitlab-org/gitlab/-/quality/test_cases/352607'
do
Page
::
Dashboard
::
Projects
.
perform
do
|
projects
|
projects
.
filter_by_name
(
project
.
name
)
expect
(
projects
).
to
have_project_with_access_role
(
project
.
name
,
'Maintainer'
)
end
...
...
@@ -87,9 +76,7 @@ module QA
expect
do
issue
.
visit!
Page
::
Project
::
Issue
::
Show
.
perform
do
|
issue
|
issue
.
delete_issue
end
Page
::
Project
::
Issue
::
Show
.
perform
(
&
:delete_issue
)
Page
::
Project
::
Issue
::
Index
.
perform
do
|
index
|
expect
(
index
).
not_to
have_issue
(
issue
)
...
...
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