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
Jérome Perrin
gitlab-ce
Commits
42b5decd
Commit
42b5decd
authored
May 03, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Try waiting for previous dropdown to definitly close before going to click
parent
f30ab494
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
app/views/projects/protected_tags/_create_protected_tag.html.haml
...s/projects/protected_tags/_create_protected_tag.html.haml
+1
-1
spec/features/protected_tags/access_control_ce_spec.rb
spec/features/protected_tags/access_control_ce_spec.rb
+4
-3
spec/features/protected_tags_spec.rb
spec/features/protected_tags_spec.rb
+1
-0
No files found.
app/views/projects/protected_tags/_create_protected_tag.html.haml
View file @
42b5decd
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
.form-group
.form-group
=
f
.
label
:name
,
class:
'col-md-2 text-right'
do
=
f
.
label
:name
,
class:
'col-md-2 text-right'
do
Tag:
Tag:
.col-md-10
.col-md-10
.protected-tags-dropdown
=
render
partial:
"projects/protected_tags/dropdown"
,
locals:
{
f:
f
}
=
render
partial:
"projects/protected_tags/dropdown"
,
locals:
{
f:
f
}
.help-block
.help-block
=
link_to
'Wildcards'
,
help_page_path
(
'user/project/protected_tags'
,
anchor:
'wildcard-protected-tags'
)
=
link_to
'Wildcards'
,
help_page_path
(
'user/project/protected_tags'
,
anchor:
'wildcard-protected-tags'
)
...
...
spec/features/protected_tags/access_control_ce_spec.rb
View file @
42b5decd
RSpec
.
shared_examples
"protected tags > access control > CE"
do
RSpec
.
shared_examples
"protected tags > access control > CE"
do
ProtectedTag
::
CreateAccessLevel
.
human_access_levels
.
each
do
|
(
access_type_id
,
access_type_name
)
|
ProtectedTag
::
CreateAccessLevel
.
human_access_levels
.
each
do
|
(
access_type_id
,
access_type_name
)
|
it
"allows creating protected tags that
#{
access_type_name
}
can create"
do
it
"allows creating protected tags that
#{
access_type_name
}
can create"
,
:js
do
visit
namespace_project_protected_tags_path
(
project
.
namespace
,
project
)
visit
namespace_project_protected_tags_path
(
project
.
namespace
,
project
)
set_protected_tag_name
(
'master'
)
set_protected_tag_name
(
'master'
)
...
@@ -10,8 +10,9 @@ RSpec.shared_examples "protected tags > access control > CE" do
...
@@ -10,8 +10,9 @@ RSpec.shared_examples "protected tags > access control > CE" do
unless
allowed_to_create_button
.
text
==
access_type_name
unless
allowed_to_create_button
.
text
==
access_type_name
allowed_to_create_button
.
click
allowed_to_create_button
.
click
find
(
'.dropdown.open .dropdown-menu li'
,
match: :first
)
find
(
'.create_access_levels-container .dropdown-menu li'
,
match: :first
)
within
(
".dropdown.open .dropdown-menu"
)
{
click_on
access_type_name
}
screenshot_and_open_image
within
(
'.create_access_levels-container .dropdown-menu'
)
{
click_on
access_type_name
}
end
end
end
end
...
...
spec/features/protected_tags_spec.rb
View file @
42b5decd
...
@@ -11,6 +11,7 @@ feature 'Projected Tags', feature: true, js: true do
...
@@ -11,6 +11,7 @@ feature 'Projected Tags', feature: true, js: true do
find
(
".js-protected-tag-select"
).
click
find
(
".js-protected-tag-select"
).
click
find
(
".dropdown-input-field"
).
set
(
tag_name
)
find
(
".dropdown-input-field"
).
set
(
tag_name
)
click_on
(
"Create wildcard
#{
tag_name
}
"
)
click_on
(
"Create wildcard
#{
tag_name
}
"
)
find
(
'.protected-tags-dropdown .dropdown-menu'
,
visible:
false
)
end
end
describe
"explicit protected tags"
do
describe
"explicit protected tags"
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