diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-07-21 09:50:29 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-07-21 09:50:29 +0000 |
| commit | b7d372d9427c11b86b7dda7611860920fe96b3b6 (patch) | |
| tree | ac502435d10a3da19c0d45ef09aa84fd1391e4c4 /spec | |
| parent | cfba167694e809c135365d3f3ee710402129c7dc (diff) | |
| parent | fcdcc0d351e07f3838f71f6d617cf2f3d13c663a (diff) | |
| download | gitlab-ce-b7d372d9427c11b86b7dda7611860920fe96b3b6.tar.gz | |
Merge branch '31031-convert-protected-branches-es6' into 'master'
Convert Protected Branches feature JS code to ES6
See merge request !12970
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/shared_examples/features/protected_branches_access_control_ce.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb index 66e598e2691..d5bc12f3bc5 100644 --- a/spec/support/shared_examples/features/protected_branches_access_control_ce.rb +++ b/spec/support/shared_examples/features/protected_branches_access_control_ce.rb @@ -5,7 +5,7 @@ shared_examples "protected branches > access control > CE" do set_protected_branch_name('master') - within('.new_protected_branch') do + within('.js-new-protected-branch') do allowed_to_push_button = find(".js-allowed-to-push") unless allowed_to_push_button.text == access_type_name @@ -50,7 +50,7 @@ shared_examples "protected branches > access control > CE" do set_protected_branch_name('master') - within('.new_protected_branch') do + within('.js-new-protected-branch') do allowed_to_merge_button = find(".js-allowed-to-merge") unless allowed_to_merge_button.text == access_type_name |