From 99b6750e1586d7d5195a064e9b5226db7c64d276 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 21 Feb 2013 16:26:09 +0200 Subject: [PATCH] Restore old order for MR lists. Fix failing tests --- app/contexts/merge_requests_load_context.rb | 2 +- spec/features/notes_on_merge_requests_spec.rb | 2 +- spec/features/notes_on_wall_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/contexts/merge_requests_load_context.rb b/app/contexts/merge_requests_load_context.rb index 683f4c83e77..fde04085f26 100644 --- a/app/contexts/merge_requests_load_context.rb +++ b/app/contexts/merge_requests_load_context.rb @@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext end 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)? if params[:assignee_id].present? diff --git a/spec/features/notes_on_merge_requests_spec.rb b/spec/features/notes_on_merge_requests_spec.rb index 059e65f8cee..9bef01868db 100644 --- a/spec/features/notes_on_merge_requests_spec.rb +++ b/spec/features/notes_on_merge_requests_spec.rb @@ -67,7 +67,7 @@ describe "On a merge request", js: true do end # note added - it { within(".js-main-target-form") { should have_content("This is awsome!") } } + it { should have_content("This is awsome!") } # reset form it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } } diff --git a/spec/features/notes_on_wall_spec.rb b/spec/features/notes_on_wall_spec.rb index 1281f2b1a66..69f35beadae 100644 --- a/spec/features/notes_on_wall_spec.rb +++ b/spec/features/notes_on_wall_spec.rb @@ -66,7 +66,7 @@ describe "On the project wall", js: true do end # note added - it { within(".js-main-target-form") { should have_content("This is awsome!") } } + it { should have_content("This is awsome!") } # reset form it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }