1 files changed, 48 insertions, 27 deletions

diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
index 979bbd57aa3..d69c3f2652c 100644
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
@@ -6,43 +6,64 @@ RSpec.describe 'Projects > Members > Maintainer adds member with expiration date
   include Select2Helper
   include ActiveSupport::Testing::TimeHelpers
 
-  let(:maintainer) { create(:user) }
-  let(:project) { create(:project) }
-  let!(:new_member) { create(:user) }
+  let_it_be(:maintainer) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let(:new_member) { create(:user) }
 
   before do
+    travel_to Time.now.utc.beginning_of_day
+
     project.add_maintainer(maintainer)
     sign_in(maintainer)
   end
 
   it 'expiration date is displayed in the members list' do
-    travel_to Time.zone.parse('2016-08-06 08:00') do
-      date = 4.days.from_now
-      visit project_project_members_path(project)
-
-      page.within '.invite-users-form' do
-        select2(new_member.id, from: '#user_ids', multiple: true)
-        fill_in 'expires_at', with: date.to_s(:medium) + "\n"
-        click_on 'Invite'
-      end
-
-      page.within "#project_member_#{new_member.project_members.first.id}" do
-        expect(page).to have_content('Expires in 4 days')
-      end
+    visit project_project_members_path(project)
+
+    page.within '.invite-users-form' do
+      select2(new_member.id, from: '#user_ids', multiple: true)
+
+      fill_in 'expires_at', with: 3.days.from_now.to_date
+      find_field('expires_at').native.send_keys :enter
+
+      click_on 'Invite'
+    end
+
+    page.within "#project_member_#{project_member_id}" do
+      expect(page).to have_content('Expires in 3 days')
+    end
+  end
+
+  it 'changes expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: Date.today.to_date)
+    visit project_project_members_path(project)
+
+    page.within "#project_member_#{project_member_id}" do
+      fill_in 'Expiration date', with: 3.days.from_now.to_date
+      find_field('Expiration date').native.send_keys :enter
+
+      wait_for_requests
+
+      expect(page).to have_content('Expires in 3 days')
     end
   end
 
-  it 'change expiration date' do
-    travel_to Time.zone.parse('2016-08-06 08:00') do
-      date = 3.days.from_now
-      project.team.add_users([new_member.id], :developer, expires_at: Date.today.to_s(:medium))
-      visit project_project_members_path(project)
-
-      page.within "#project_member_#{new_member.project_members.first.id}" do
-        find('.js-access-expiration-date').set date.to_s(:medium) + "\n"
-        wait_for_requests
-        expect(page).to have_content('Expires in 3 days')
-      end
+  it 'clears expiration date' do
+    project.team.add_users([new_member.id], :developer, expires_at: 3.days.from_now.to_date)
+    visit project_project_members_path(project)
+
+    page.within "#project_member_#{project_member_id}" do
+      expect(page).to have_content('Expires in 3 days')
+
+      find('.js-clear-input').click
+
+      wait_for_requests
+
+      expect(page).not_to have_content('Expires in')
     end
   end
+
+  def project_member_id
+    project.members.find_by(user_id: new_member).id
+  end
 end