1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
# frozen_string_literal: true
require 'spec_helper'
RSpec.describe 'Projects > Files > User wants to edit a file', feature_category: :projects do
include ProjectForksHelper
let(:project) { create(:project, :repository, :public) }
let(:user) { project.first_owner }
let(:commit_params) do
{
start_branch: project.default_branch,
branch_name: project.default_branch,
commit_message: "Committing First Update",
file_path: ".gitignore",
file_content: "First Update",
last_commit_sha: Gitlab::Git::Commit.last_for_path(project.repository, project.default_branch,
".gitignore").sha
}
end
context 'when the user has write access' do
before do
sign_in user
visit project_edit_blob_path(project,
File.join(project.default_branch, '.gitignore'))
end
it 'file has been updated since the user opened the edit page' do
Files::UpdateService.new(project, user, commit_params).execute
click_button 'Commit changes'
expect(page).to have_content 'Someone edited the file the same time you did.'
end
end
context 'when the user does not have write access' do
let(:user) { create(:user) }
context 'and the user has a fork of the project' do
let(:forked_project) { fork_project(project, user, namespace: user.namespace, repository: true) }
before do
forked_project
sign_in user
visit project_edit_blob_path(project,
File.join(project.default_branch, '.gitignore'))
end
context 'and the forked project is ahead of the upstream project' do
before do
Files::UpdateService.new(forked_project, user, commit_params).execute
end
it 'renders an error message' do
click_button 'Commit changes'
expect(page).to have_content(
%(Error: Can't edit this file. The fork and upstream project have diverged. Edit the file on the fork)
)
end
end
end
end
end
|
