Download as
Browse Code »

Commit 99b6750e1586d7d5195a064e9b5226db7c64d276

Authored by Dmitriy Zaporozhets
1 parent 4a137651
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Restore old order for MR lists. Fix failing tests

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/contexts/merge_requests_load_context.rb
  Diff comments   View file @99b6750
... ... @@ -14,7 +14,7 @@ class MergeRequestsLoadContext < BaseContext
14 14 end
15 15  
16 16 merge_requests = merge_requests.page(params[:page]).per(20)
17   - merge_requests = merge_requests.includes(:author, :project).order("state, created_at desc")
  17 + merge_requests = merge_requests.includes(:author, :project).order("created_at desc")
18 18  
19 19 # Filter by specific assignee_id (or lack thereof)?
20 20 if params[:assignee_id].present?
... ...
spec/features/notes_on_merge_requests_spec.rb
  Diff comments   View file @99b6750
... ... @@ -67,7 +67,7 @@ describe "On a merge request", js: true do
67 67 end
68 68  
69 69 # note added
70   - it { within(".js-main-target-form") { should have_content("This is awsome!") } }
  70 + it { should have_content("This is awsome!") }
71 71  
72 72 # reset form
73 73 it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
... ...
spec/features/notes_on_wall_spec.rb
  Diff comments   View file @99b6750
... ... @@ -66,7 +66,7 @@ describe "On the project wall", js: true do
66 66 end
67 67  
68 68 # note added
69   - it { within(".js-main-target-form") { should have_content("This is awsome!") } }
  69 + it { should have_content("This is awsome!") }
70 70  
71 71 # reset form
72 72 it { within(".js-main-target-form") { should have_no_field("note[note]", with: "This is awesome!") } }
... ...