From eb004dc626d3a1c9497e8b9dc0f3f578afd05fd9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 27 Oct 2020 12:08:33 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/projects/blobs/edit_spec.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'spec/features/projects/blobs/edit_spec.rb') diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb index c30c8dda852..3f1c10b3688 100644 --- a/spec/features/projects/blobs/edit_spec.rb +++ b/spec/features/projects/blobs/edit_spec.rb @@ -179,12 +179,14 @@ RSpec.describe 'Editing file blob', :js do end context 'with protected branch' do - before do - visit project_edit_blob_path(project, tree_join(protected_branch, file_path)) - end - it 'shows blob editor with patch branch' do - expect(find('.js-branch-name').value).to eq('patch-1') + freeze_time do + visit project_edit_blob_path(project, tree_join(protected_branch, file_path)) + + epoch = Time.now.strftime('%s%L').last(5) + + expect(find('.js-branch-name').value).to eq "#{user.username}-protected-branch-patch-#{epoch}" + end end end end -- cgit v1.2.1