Commit 99b6750e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Restore old order for MR lists. Fix failing tests

parent 4a137651
...@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext ...@@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
end end
merge_requests = merge_requests.page(params[:page]).per(20) merge_requests = merge_requests.page(params[:page]).per(20)
merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc") merge_requests = merge_requests.includes(:author, :project).order("created_at desc")
# Filter by specific assignee_id (or lack thereof)? # Filter by specific assignee_id (or lack thereof)?
if params[:assignee_id].present? if params[:assignee_id].present?
......
...@@ -67,7 +67,7 @@ describe "On a merge request", js: true do ...@@ -67,7 +67,7 @@ describe "On a merge request", js: true do
end end
# note added # note added
it { within(".js-main-target-form") { should have_content("This is awsome!") } } it { should have_content("This is awsome!") }
# reset form # reset form
it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
......
...@@ -66,7 +66,7 @@ describe "On the project wall", js: true do ...@@ -66,7 +66,7 @@ describe "On the project wall", js: true do
end end
# note added # note added
it { within(".js-main-target-form") { should have_content("This is awsome!") } } it { should have_content("This is awsome!") }
# reset form # reset form
it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment