Commit 99c263ad authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Updated some tests descriptions to represent the correct settings path

Updated the js from the member_expiration_date to es6
parent cfd8f635
/* eslint-disable func-names, space-before-function-paren, vars-on-top, no-var, object-shorthand, comma-dangle, max-len */ /* eslint-disable func-names, space-before-function-paren, vars-on-top, no-var, object-shorthand, comma-dangle, max-len */
(function() { (() => {
// Add datepickers to all `js-access-expiration-date` elements. If those elements are // Add datepickers to all `js-access-expiration-date` elements. If those elements are
// children of an element with the `clearable-input` class, and have a sibling // children of an element with the `clearable-input` class, and have a sibling
// `js-clear-input` element, then show that element when there is a value in the // `js-clear-input` element, then show that element when there is a value in the
// datepicker, and make clicking on that element clear the field. // datepicker, and make clicking on that element clear the field.
// //
gl.MemberExpirationDate = function(newSelector) { gl.MemberExpirationDate = (selector = '.js-access-expiration-date') => {
function toggleClearInput() { function toggleClearInput() {
$(this).closest('.clearable-input').toggleClass('has-value', $(this).val() !== ''); $(this).closest('.clearable-input').toggleClass('has-value', $(this).val() !== '');
} }
var selector = '.js-access-expiration-date';
if (typeof newSelector !== 'undefined' && newSelector !== '') {
selector = newSelector;
}
var inputs = $(selector); var inputs = $(selector);
inputs.datepicker({ inputs.datepicker({
...@@ -25,7 +21,7 @@ ...@@ -25,7 +21,7 @@
} }
}); });
inputs.next('.js-clear-input').on('click', function(event) { inputs.next('.js-clear-input').on('click', (event) => {
event.preventDefault(); event.preventDefault();
var input = $(this).closest('.clearable-input').find(selector); var input = $(this).closest('.clearable-input').find(selector);
......
...@@ -82,7 +82,7 @@ describe "Internal Project Access", feature: true do ...@@ -82,7 +82,7 @@ describe "Internal Project Access", feature: true do
it { is_expected.to be_denied_for(:visitor) } it { is_expected.to be_denied_for(:visitor) }
end end
describe "GET /:project_path/settings/project_members" do describe "GET /:project_path/settings/members" do
subject { namespace_project_settings_members_path(project.namespace, project) } subject { namespace_project_settings_members_path(project.namespace, project) }
it { is_expected.to be_allowed_for(:admin) } it { is_expected.to be_allowed_for(:admin) }
......
...@@ -82,7 +82,7 @@ describe "Private Project Access", feature: true do ...@@ -82,7 +82,7 @@ describe "Private Project Access", feature: true do
it { is_expected.to be_denied_for(:visitor) } it { is_expected.to be_denied_for(:visitor) }
end end
describe "GET /:project_path/settings/project_members" do describe "GET /:project_path/settings/members" do
subject { namespace_project_settings_members_path(project.namespace, project) } subject { namespace_project_settings_members_path(project.namespace, project) }
it { is_expected.to be_allowed_for(:admin) } it { is_expected.to be_allowed_for(:admin) }
......
...@@ -82,7 +82,7 @@ describe "Public Project Access", feature: true do ...@@ -82,7 +82,7 @@ describe "Public Project Access", feature: true do
it { is_expected.to be_allowed_for(:visitor) } it { is_expected.to be_allowed_for(:visitor) }
end end
describe "GET /:project_path/settings/project_members" do describe "GET /:project_path/settings/members" do
subject { namespace_project_settings_members_path(project.namespace, project) } subject { namespace_project_settings_members_path(project.namespace, project) }
it { is_expected.to be_allowed_for(:admin) } it { is_expected.to be_allowed_for(:admin) }
......
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