GitLab steht aufgrund wichtiger Wartungsarbeiten am Montag, den 8. März, zwischen 17:00 und 19:00 Uhr nicht zur Verfügung.

Commit 83310369 authored by Phil Hughes's avatar Phil Hughes

Fixed some specs

CHANGELOG item
parent 2b945741
......@@ -15,7 +15,7 @@
IssuableForm.prototype.wipRegex = /^\s*(\[WIP\]\s*|WIP:\s*|WIP\s+)+\s*/i;
function IssuableForm(form) {
var $issuableDueDate;
var $issuableDueDate, calendar;
this.form = form;
this.toggleWip = bind(this.toggleWip, this);
this.renderWipExplanation = bind(this.renderWipExplanation, this);
......@@ -37,7 +37,7 @@
this.initMoveDropdown();
$issuableDueDate = $('#issuable-due-date');
if ($issuableDueDate.length) {
var calendar = new Pikaday({
calendar = new Pikaday({
field: $issuableDueDate.get(0),
theme: 'gitlab-theme',
format: 'yyyy-mm-dd',
......
......@@ -21,12 +21,12 @@
theme: 'gitlab-theme',
format: 'yyyy-mm-dd',
minDate: new Date(),
onSelect: (dateText) => {
onSelect(dateText) {
$input.val(dateFormat(new Date(dateText), 'yyyy-mm-dd'));
$input.trigger('change');
toggleClearInput.call(this);
toggleClearInput.call($input);
},
});
......
......@@ -46,7 +46,7 @@
.pika-single.gitlab-theme {
.pika-label {
color: $gl-gray;
color: $gl-text-color-secondary;
font-size: 14px;
font-weight: normal;
}
......
---
title: Replaced jQuery UI datepicker
merge_request:
author:
......@@ -241,7 +241,7 @@
page.within('.due_date') do
click_link 'Edit'
click_link Date.today.day
click_button Date.today.day
wait_for_vue_resource
......
......@@ -78,8 +78,8 @@
fill_in 'issue_description', with: 'bug description'
find('#issuable-due-date').click
page.within '.ui-datepicker' do
click_link date.day
page.within '.pika-single' do
click_button date.day
end
expect(find('#issuable-due-date').value).to eq date.to_s
......@@ -110,8 +110,8 @@
fill_in 'issue_description', with: 'bug description'
find('#issuable-due-date').click
page.within '.ui-datepicker' do
click_link date.day
page.within '.pika-single' do
click_button date.day
end
expect(find('#issuable-due-date').value).to eq date.to_s
......@@ -624,8 +624,8 @@
page.within '.due_date' do
click_link 'Edit'
page.within '.ui-datepicker-calendar' do
click_link date.day
page.within '.pika-single' do
click_button date.day
end
wait_for_ajax
......@@ -636,10 +636,10 @@
it 'removes due date from issue' do
page.within '.due_date' do
click_link 'Edit'
date = Date.today.at_beginning_of_month + 2.days
page.within '.ui-datepicker-calendar' do
first('.ui-state-default').click
page.within '.pika-single' do
click_button date.day
end
wait_for_ajax
......
......@@ -34,7 +34,7 @@ def disallow_personal_access_token_saves!
# Set date to 1st of next month
find_field("Expires at").trigger('focus')
find("a[title='Next']").click
find(".pika-next").click
click_on "1"
# Scopes
......
......@@ -14,32 +14,30 @@
login_as(master)
end
scenario 'expiration date is displayed in the members list', js: true do
travel_to Time.zone.parse('2016-08-06 08:00') do
visit namespace_project_settings_members_path(project.namespace, project)
page.within '.users-project-form' do
select2(new_member.id, from: '#user_ids', multiple: true)
fill_in 'expires_at', with: '2016-08-10'
end
find('.users-project-form').click
scenario 'expiration date is displayed in the members list' do
date = 5.days.from_now
visit namespace_project_project_members_path(project.namespace, project)
page.within '.users-project-form' do
select2(new_member.id, from: '#user_ids', multiple: true)
fill_in 'expires_at', with: date.to_s(:medium)
click_on 'Add to project'
end
page.within "#project_member_#{new_member.project_members.first.id}" do
expect(page).to have_content('Expires in 4 days')
end
page.within "#project_member_#{new_member.project_members.first.id}" do
expect(page).to have_content('Expires in 4 days')
end
end
scenario 'change expiration date' do
travel_to Time.zone.parse('2016-08-06 08:00') do
project.team.add_users([new_member.id], :developer, expires_at: '2016-09-06')
visit namespace_project_project_members_path(project.namespace, project)
page.within "#project_member_#{new_member.project_members.first.id}" do
find('.js-access-expiration-date').set '2016-08-09'
wait_for_ajax
expect(page).to have_content('Expires in 3 days')
end
date = 4.days.from_now
project.team.add_users([new_member.id], :developer, expires_at: Date.today.to_s(:medium))
visit namespace_project_project_members_path(project.namespace, project)
page.within "#project_member_#{new_member.project_members.first.id}" do
find('.js-access-expiration-date').set date.to_s(:medium)
wait_for_ajax
expect(page).to have_content('Expires in 3 days')
end
end
end
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