Fixed builds
This commit is contained in:
parent
8cdb505878
commit
017ed4ae37
|
@ -235,6 +235,10 @@
|
|||
padding: 0;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
.ci-status-link {
|
||||
margin-right: 5px;
|
||||
}
|
||||
}
|
||||
|
||||
.merge-request-select {
|
||||
|
|
|
@ -19,23 +19,16 @@
|
|||
.pull-right
|
||||
- if ci_commit
|
||||
= render_ci_status(ci_commit)
|
||||
|
||||
= clipboard_button(clipboard_text: commit.id)
|
||||
= link_to commit.short_id, namespace_project_commit_path(project.namespace, project, commit), class: "commit_short_id"
|
||||
|
||||
.notes_count
|
||||
- if note_count > 0
|
||||
%span.light
|
||||
%i.fa.fa-comments
|
||||
= note_count
|
||||
|
||||
- if commit.description?
|
||||
.commit-row-description.js-toggle-content
|
||||
%pre
|
||||
= preserve(markdown(escape_once(commit.description), pipeline: :single_line))
|
||||
|
||||
.commit-row-info
|
||||
by
|
||||
by
|
||||
= commit_author_link(commit, avatar: true, size: 24)
|
||||
.committed_ago
|
||||
#{time_ago_with_tooltip(commit.committed_date, skip_js: true)}
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
.merge-request-select.dropdown
|
||||
= f.hidden_field :source_project_id
|
||||
= dropdown_toggle @merge_request.source_project_path, { toggle: "dropdown", field_name: "#{f.object_name}[source_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-source-project" }
|
||||
.dropdown-menu.dropdown-menu-selectable
|
||||
.dropdown-menu.dropdown-menu-selectable.dropdown-source-project
|
||||
= dropdown_title("Select source project")
|
||||
= dropdown_filter("Search projects")
|
||||
= dropdown_content do
|
||||
|
@ -23,7 +23,7 @@
|
|||
.merge-request-select.dropdown
|
||||
= f.hidden_field :source_branch
|
||||
= dropdown_toggle "Select source branch", { toggle: "dropdown", field_name: "#{f.object_name}[source_branch]" }, { toggle_class: "js-compare-dropdown js-source-branch" }
|
||||
.dropdown-menu.dropdown-menu-selectable
|
||||
.dropdown-menu.dropdown-menu-selectable.dropdown-source-branch
|
||||
= dropdown_title("Select source branch")
|
||||
= dropdown_filter("Search branches")
|
||||
= dropdown_content do
|
||||
|
@ -45,7 +45,7 @@
|
|||
.merge-request-select.dropdown
|
||||
= f.hidden_field :target_project_id
|
||||
= dropdown_toggle f.object.target_project.path_with_namespace, { toggle: "dropdown", field_name: "#{f.object_name}[target_project_id]", disabled: @merge_request.persisted? }, { toggle_class: "js-compare-dropdown js-target-project" }
|
||||
.dropdown-menu.dropdown-menu-selectable
|
||||
.dropdown-menu.dropdown-menu-selectable.dropdown-target-project
|
||||
= dropdown_title("Select target project")
|
||||
= dropdown_filter("Search projects")
|
||||
= dropdown_content do
|
||||
|
@ -57,7 +57,7 @@
|
|||
.merge-request-select.dropdown
|
||||
= f.hidden_field :target_branch
|
||||
= dropdown_toggle f.object.target_branch, { toggle: "dropdown", field_name: "#{f.object_name}[target_branch]" }, { toggle_class: "js-compare-dropdown js-target-branch" }
|
||||
.dropdown-menu.dropdown-menu-selectable.js-target-branch-dropdown
|
||||
.dropdown-menu.dropdown-menu-selectable.dropdown-target-branch.js-target-branch-dropdown
|
||||
= dropdown_title("Select target branch")
|
||||
= dropdown_filter("Search branches")
|
||||
= dropdown_content do
|
||||
|
|
|
@ -4,6 +4,7 @@ Feature: Project Forked Merge Requests
|
|||
And I am a member of project "Shop"
|
||||
And I have a project forked off of "Shop" called "Forked Shop"
|
||||
|
||||
@javascript
|
||||
Scenario: I submit new unassigned merge request to a forked project
|
||||
Given I visit project "Forked Shop" merge requests page
|
||||
And I click link "New Merge Request"
|
||||
|
|
|
@ -70,6 +70,7 @@ Feature: Project Merge Requests
|
|||
When I click link "Reopen"
|
||||
Then I should see reopened merge request "Bug NS-04"
|
||||
|
||||
@javascript
|
||||
Scenario: I submit new unassigned merge request
|
||||
Given I click link "New Merge Request"
|
||||
And I submit new merge request "Wiki Feature"
|
||||
|
|
|
@ -34,10 +34,14 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I fill out a "Merge Request On Forked Project" merge request' do
|
||||
select @forked_project.path_with_namespace, from: "merge_request_source_project_id"
|
||||
select @project.path_with_namespace, from: "merge_request_target_project_id"
|
||||
select "fix", from: "merge_request_source_branch"
|
||||
select "master", from: "merge_request_target_branch"
|
||||
first('.js-source-project').click
|
||||
first('.dropdown-source-project a', text: @forked_project.path_with_namespace)
|
||||
|
||||
first('.js-target-project').click
|
||||
first('.dropdown-target-project a', text: @project.path_with_namespace)
|
||||
|
||||
first('.js-source-branch').click
|
||||
first('.dropdown-source-branch .dropdown-content a', text: 'fix').click
|
||||
|
||||
click_button "Compare branches and continue"
|
||||
|
||||
|
@ -115,10 +119,10 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I fill out an invalid "Merge Request On Forked Project" merge request' do
|
||||
expect(find(:select, "merge_request_source_project_id", {}).value).to eq @forked_project.id.to_s
|
||||
expect(find(:select, "merge_request_target_project_id", {}).value).to eq @project.id.to_s
|
||||
expect(find(:select, "merge_request_source_branch", {}).value).to eq ""
|
||||
expect(find(:select, "merge_request_target_branch", {}).value).to eq "master"
|
||||
expect(find_by_id("merge_request_source_project_id", visible: false).value).to eq @forked_project.id.to_s
|
||||
expect(find_by_id("merge_request_target_project_id", visible: false).value).to eq @project.id.to_s
|
||||
expect(find_by_id("merge_request_source_branch", visible: false).value).to eq nil
|
||||
expect(find_by_id("merge_request_target_branch", visible: false).value).to eq "master"
|
||||
click_button "Compare branches"
|
||||
end
|
||||
|
||||
|
@ -127,7 +131,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'the target repository should be the original repository' do
|
||||
expect(page).to have_select("merge_request_target_project_id", selected: @project.path_with_namespace)
|
||||
expect(find_by_id("merge_request_target_project_id").value).to eq "#{@project.id}"
|
||||
end
|
||||
|
||||
step 'I click "Assign to" dropdown"' do
|
||||
|
|
|
@ -93,8 +93,12 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
|
|||
end
|
||||
|
||||
step 'I submit new merge request "Wiki Feature"' do
|
||||
select "fix", from: "merge_request_source_branch"
|
||||
select "feature", from: "merge_request_target_branch"
|
||||
find('.js-source-branch').click
|
||||
find('.dropdown-source-branch .dropdown-content a', text: 'fix').click
|
||||
|
||||
find('.js-target-branch').click
|
||||
first('.dropdown-target-branch .dropdown-content a', text: 'feature').click
|
||||
|
||||
click_button "Compare branches"
|
||||
fill_in "merge_request_title", with: "Wiki Feature"
|
||||
click_button "Submit merge request"
|
||||
|
|
Loading…
Reference in New Issue