1 files changed, 38 insertions, 37 deletions
diff --git a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
index d94cc85f411..dd708c243a8 100644
--- a/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/groups/members/master_adds_member_with_expiration_date_spec.rb
@@ -6,65 +6,66 @@ RSpec.describe 'Groups > Members > Owner adds member with expiration date', :js
   include Select2Helper
   include ActiveSupport::Testing::TimeHelpers
 
-  let(:user1) { create(:user, name: 'John Doe') }
-  let!(:new_member) { create(:user, name: 'Mary Jane') }
-  let(:group) { create(:group) }
+  let_it_be(:user1) { create(:user, name: 'John Doe') }
+  let_it_be(:group) { create(:group) }
+  let(:new_member) { create(:user, name: 'Mary Jane') }
 
   before do
     stub_feature_flags(vue_group_members_list: false)
 
+    travel_to Time.now.utc.beginning_of_day
+
     group.add_owner(user1)
     sign_in(user1)
   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 group_group_members_path(group)
-
-      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 "#group_member_#{group_member_id(new_member)}" do
-        expect(page).to have_content('Expires in 4 days')
-      end
+    visit group_group_members_path(group)
+
+    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 "#group_member_#{group_member_id}" do
+      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
-      group.add_developer(new_member)
+  it 'changes expiration date' do
+    group.add_developer(new_member)
+    visit group_group_members_path(group)
+
+    page.within "#group_member_#{group_member_id}" do
+      fill_in 'Expiration date', with: 3.days.from_now.to_date
+      find_field('Expiration date').native.send_keys :enter
 
-      visit group_group_members_path(group)
+      wait_for_requests
 
-      page.within "#group_member_#{group_member_id(new_member)}" 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
+      expect(page).to have_content('Expires in 3 days')
     end
   end
 
-  it 'remove expiration date' do
-    travel_to Time.zone.parse('2016-08-06 08:00') do
-      date = 3.days.from_now
-      group_member = create(:group_member, :developer, user: new_member, group: group, expires_at: date.to_s(:medium))
+  it 'clears expiration date' do
+    create(:group_member, :developer, user: new_member, group: group, expires_at: 3.days.from_now.to_date)
+    visit group_group_members_path(group)
+
+    page.within "#group_member_#{group_member_id}" do
+      expect(page).to have_content('Expires in 3 days')
+
+      find('.js-clear-input').click
 
-      visit group_group_members_path(group)
+      wait_for_requests
 
-      page.within "#group_member_#{group_member.id}" do
-        find('.js-clear-input').click
-        wait_for_requests
-        expect(page).not_to have_content('Expires in 3 days')
-      end
+      expect(page).not_to have_content('Expires in')
     end
   end
 
-  def group_member_id(user)
+  def group_member_id
     group.members.find_by(user_id: new_member).id
   end
 end