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
Tatuya Kamada
gitlab-ce
Commits
5ce4883d
Commit
5ce4883d
authored
Jan 04, 2017
by
Jose Ivan Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a test and change the arrow functions to named functions
parent
7056e926
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
app/assets/javascripts/member_expiration_date.js.es6
app/assets/javascripts/member_expiration_date.js.es6
+2
-2
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
...s/members/master_adds_member_with_expiration_date_spec.rb
+3
-3
No files found.
app/assets/javascripts/member_expiration_date.js.es6
View file @
5ce4883d
...
@@ -14,13 +14,13 @@
...
@@ -14,13 +14,13 @@
inputs.datepicker({
inputs.datepicker({
dateFormat: 'yy-mm-dd',
dateFormat: 'yy-mm-dd',
minDate: 1,
minDate: 1,
onSelect:
() =>
{
onSelect:
function onSelect()
{
$(this).trigger('change');
$(this).trigger('change');
toggleClearInput.call(this);
toggleClearInput.call(this);
},
},
});
});
inputs.next('.js-clear-input').on('click',
(event) =>
{
inputs.next('.js-clear-input').on('click',
function clicked(event)
{
event.preventDefault();
event.preventDefault();
const input = $(this).closest('.clearable-input').find(selector);
const input = $(this).closest('.clearable-input').find(selector);
...
...
spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
View file @
5ce4883d
...
@@ -14,15 +14,15 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
...
@@ -14,15 +14,15 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
login_as
(
master
)
login_as
(
master
)
end
end
scenario
'expiration date is displayed in the members list'
do
scenario
'expiration date is displayed in the members list'
,
js:
true
do
travel_to
Time
.
zone
.
parse
(
'2016-08-06 08:00'
)
do
travel_to
Time
.
zone
.
parse
(
'2016-08-06 08:00'
)
do
visit
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
visit
namespace_project_settings_members_path
(
project
.
namespace
,
project
)
page
.
within
'.users-project-form'
do
page
.
within
'.users-project-form'
do
select2
(
new_member
.
id
,
from:
'#user_ids'
,
multiple:
true
)
select2
(
new_member
.
id
,
from:
'#user_ids'
,
multiple:
true
)
fill_in
'expires_at'
,
with:
'2016-08-10'
fill_in
'expires_at'
,
with:
'2016-08-10'
click_on
'Add to project'
end
end
find
(
'.users-project-form'
).
click
click_on
'Add to project'
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
page
.
within
"#project_member_
#{
new_member
.
project_members
.
first
.
id
}
"
do
expect
(
page
).
to
have_content
(
'Expires in 4 days'
)
expect
(
page
).
to
have_content
(
'Expires in 4 days'
)
...
...
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