45 lines
1.4 KiB
Ruby
45 lines
1.4 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe 'a maintainer edits files on a source-branch of an MR from a fork', :js do
|
|
include ProjectForksHelper
|
|
let(:user) { create(:user, username: 'the-maintainer') }
|
|
let(:target_project) { create(:project, :public, :repository) }
|
|
let(:author) { create(:user, username: 'mr-authoring-machine') }
|
|
let(:source_project) { fork_project(target_project, author, repository: true) }
|
|
|
|
let(:merge_request) do
|
|
create(:merge_request,
|
|
source_project: source_project,
|
|
target_project: target_project,
|
|
source_branch: 'fix',
|
|
target_branch: 'master',
|
|
author: author,
|
|
allow_maintainer_to_push: true)
|
|
end
|
|
|
|
before do
|
|
target_project.add_master(user)
|
|
sign_in(user)
|
|
|
|
visit project_merge_request_path(target_project, merge_request)
|
|
click_link 'Changes'
|
|
wait_for_requests
|
|
first('.js-file-title').click_link 'Edit'
|
|
wait_for_requests
|
|
end
|
|
|
|
it 'mentions commits will go to the source branch' do
|
|
expect(page).to have_content('Your changes can be committed to fix because a merge request is open.')
|
|
end
|
|
|
|
it 'allows committing to the source branch' do
|
|
find('.ace_text-input', visible: false).send_keys('Updated the readme')
|
|
|
|
click_button 'Commit changes'
|
|
wait_for_requests
|
|
|
|
expect(page).to have_content('Your changes have been successfully committed')
|
|
expect(page).to have_content('Updated the readme')
|
|
end
|
|
end
|