Commit 7fd235da authored by Phil Hughes's avatar Phil Hughes

Changed Ruby to use symbol

parent 73cbd727
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
this.isAllowedToPushDropdown = false; this.isAllowedToPushDropdown = false;
this.groups = []; this.groups = [];
this.accessLevel = accessLevel; this.accessLevel = accessLevel;
this.accessLevelsData = accessLevelsData.Roles; this.accessLevelsData = accessLevelsData.roles;
this.$dropdown = $dropdown; this.$dropdown = $dropdown;
this.$wrap = this.$dropdown.closest(`.${this.accessLevel}-container`); this.$wrap = this.$dropdown.closest(`.${this.accessLevel}-container`);
this.usersPath = '/autocomplete/users.json'; this.usersPath = '/autocomplete/users.json';
......
...@@ -70,10 +70,10 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController ...@@ -70,10 +70,10 @@ class Projects::ProtectedBranchesController < Projects::ApplicationController
def access_levels_options def access_levels_options
{ {
push_access_levels: { push_access_levels: {
"Roles" => ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }, roles: ProtectedBranch::PushAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } },
}, },
merge_access_levels: { merge_access_levels: {
"Roles" => ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } }, roles: ProtectedBranch::MergeAccessLevel.human_access_levels.map { |id, text| { id: id, text: text, before_divider: true } },
}, },
selected_merge_access_levels: @protected_branch.merge_access_levels.map { |access_level| access_level.user_id || access_level.access_level }, selected_merge_access_levels: @protected_branch.merge_access_levels.map { |access_level| access_level.user_id || access_level.access_level },
selected_push_access_levels: @protected_branch.push_access_levels.map { |access_level| access_level.user_id || access_level.access_level } selected_push_access_levels: @protected_branch.push_access_levels.map { |access_level| access_level.user_id || access_level.access_level }
......
...@@ -92,10 +92,13 @@ RSpec.shared_examples "protected branches > access control > EE" do ...@@ -92,10 +92,13 @@ RSpec.shared_examples "protected branches > access control > EE" do
within(".protected-branches-list") do within(".protected-branches-list") do
find(".js-allowed-to-#{git_operation}").click find(".js-allowed-to-#{git_operation}").click
find(".dropdown-input-field").set(users.last.name) # Find a user that is not loaded find(".dropdown-input-field").set(users.last.name) # Find a user that is not loaded
expect(page).to have_selector('.dropdown-header', count: 3) expect(page).to have_selector('.dropdown-header', count: 3)
%w{Roles Groups Users}.each_with_index do |header, index| %w{Roles Groups Users}.each_with_index do |header, index|
expect(all('.dropdown-header')[index]).to have_content(header) expect(all('.dropdown-header')[index]).to have_content(header)
end end
wait_for_ajax wait_for_ajax
click_on users.last.name click_on users.last.name
find(".js-allowed-to-#{git_operation}").click # close find(".js-allowed-to-#{git_operation}").click # close
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment