Fix specs
This commit is contained in:
parent
e40f8f27a1
commit
4fc53067f0
|
@ -163,7 +163,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
|
|||
get :diff_for_path
|
||||
get :branch_from
|
||||
get :branch_to
|
||||
get '(:merge_request_source_branch)', action: :new
|
||||
get '', action: :new
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -147,10 +147,12 @@ describe 'Dashboard Projects' do
|
|||
end
|
||||
|
||||
context 'last push widget', :use_clean_rails_memory_store_caching do
|
||||
let(:ref) { "feature" }
|
||||
|
||||
before do
|
||||
event = create(:push_event, project: project, author: user)
|
||||
|
||||
create(:push_event_payload, event: event, ref: 'feature', action: :created)
|
||||
create(:push_event_payload, event: event, ref: ref, action: :created)
|
||||
|
||||
Users::LastPushEventService.new(user).cache_last_push_event(event)
|
||||
|
||||
|
@ -165,9 +167,9 @@ describe 'Dashboard Projects' do
|
|||
end
|
||||
|
||||
expect(page).to have_selector('.merge-request-form')
|
||||
expect(current_path).to eq project_new_merge_request_path(project)
|
||||
expect(current_path).to eq project_new_merge_request_path(project, merge_request_source_branch: ref)
|
||||
expect(find('#merge_request_target_project_id', visible: false).value).to eq project.id.to_s
|
||||
expect(find('input#merge_request_source_branch', visible: false).value).to eq 'feature'
|
||||
expect(find('input#merge_request_source_branch', visible: false).value).to eq ref
|
||||
expect(find('input#merge_request_target_branch', visible: false).value).to eq 'master'
|
||||
end
|
||||
end
|
||||
|
|
|
@ -57,7 +57,7 @@ describe 'Projects > Files > User creates a directory', :js do
|
|||
expect(page).to have_content('From new-feature into master')
|
||||
expect(page).to have_content('Add new directory')
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(project))
|
||||
expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new-feature"))
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -80,8 +80,7 @@ describe 'Projects > Files > User creates a directory', :js do
|
|||
click_button('Create directory')
|
||||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
@ -144,7 +144,7 @@ describe 'Projects > Files > User creates files' do
|
|||
fill_in(:branch_name, with: 'new_branch_name', visible: true)
|
||||
click_button('Commit changes')
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(project))
|
||||
expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
|
||||
|
||||
click_link('Changes')
|
||||
|
||||
|
@ -182,7 +182,7 @@ describe 'Projects > Files > User creates files' do
|
|||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
|
||||
expect(page).to have_content('New commit message')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -63,7 +63,7 @@ describe 'Projects > Files > User deletes files', :js do
|
|||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
|
||||
expect(page).to have_content('New commit message')
|
||||
end
|
||||
end
|
||||
|
|
|
@ -86,7 +86,7 @@ describe 'Projects > Files > User edits files', :js do
|
|||
fill_in(:branch_name, with: 'new_branch_name', visible: true)
|
||||
click_button('Commit changes')
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(project))
|
||||
expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
|
||||
|
||||
click_link('Changes')
|
||||
|
||||
|
@ -155,7 +155,7 @@ describe 'Projects > Files > User edits files', :js do
|
|||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
|
||||
|
||||
wait_for_requests
|
||||
|
||||
|
@ -183,7 +183,7 @@ describe 'Projects > Files > User edits files', :js do
|
|||
|
||||
fork = user.fork_of(project2)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "patch-1"))
|
||||
|
||||
wait_for_requests
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ describe 'Projects > Files > User replaces files', :js do
|
|||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "undefined"))
|
||||
|
||||
click_link('Changes')
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ describe 'Projects > Files > User uploads files' do
|
|||
click_button('Upload file')
|
||||
|
||||
expect(page).to have_content('New commit message')
|
||||
expect(current_path).to eq(project_new_merge_request_path(project))
|
||||
expect(current_path).to eq(project_new_merge_request_path(project, merge_request_source_branch: "new_branch_name"))
|
||||
|
||||
click_link('Changes')
|
||||
find("a[data-action='diffs']", text: 'Changes').click
|
||||
|
@ -92,7 +92,7 @@ describe 'Projects > Files > User uploads files' do
|
|||
|
||||
fork = user.fork_of(project2.reload)
|
||||
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork))
|
||||
expect(current_path).to eq(project_new_merge_request_path(fork, merge_request_source_branch: "undefined"))
|
||||
|
||||
find("a[data-action='diffs']", text: 'Changes').click
|
||||
|
||||
|
|
Loading…
Reference in New Issue