Add functionality to sort announcements

Test plan:
-announcements with a greater date should be at the top

fixes KNO-470

flag=past_announcements

Change-Id: I27c9809ab800a02fe2dbe9a7c6807f09f9ba3bc7
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/238101
Tested-by: Service Cloud Jenkins <[email protected]>
Reviewed-by: Rob Orton <[email protected]>
QA-Review: Rob Orton <[email protected]>
Product-Review: Rob Orton <[email protected]>

app/models/account_notification.rb

@@ -152,7 +152,7 @@ def self.for_user_and_account(user, root_account, include_past: false)
         end
       end
 
-      current
+      current.sort_by {|item| item[:end_at]}.reverse
     end
   end
 

spec/models/account_notification_spec.rb

@@ -71,6 +71,28 @@
     expect(AccountNotification.for_user_and_account(@unenrolled, Account.site_admin).map(&:id).sort).to eq [@a5.id, @a6.id]
   end
 
+  it 'should sort' do
+    @announcement.destroy
+    role_ids = ["TeacherEnrollment", "AccountAdmin"].map{|name| Role.get_built_in_role(name).id}
+    account_notification(:role_ids => role_ids, :message => "Announcement 1")
+    @a1 = @announcement
+    account_notification(:account => @account, :role_ids => [nil], :message => "Announcement 2") #students not currently taking a course
+    @a2 = @announcement
+    account_notification(:account => @account, :message => "Announcement 3") # no roles, should go to all
+    @announcement[:end_at] = @announcement[:end_at] + 1.month
+    @a3 = @announcement
+
+    @unenrolled = @user
+    course_with_teacher(:account => @account)
+    @teacher = @user
+    account_admin_user(:account => @account)
+    @admin = @user
+    course_with_student(:course => @course).accept(true)
+    @student = @user
+
+    expect(AccountNotification.for_user_and_account(@teacher, @account)).to eq [@a3, @a1]
+  end
+
   it "should allow closing an announcement" do
     @user.close_announcement(@announcement)
     expect(@user.get_preference(:closed_notifications)).to eq [@announcement.id]

spec/selenium/dashboard_spec.rb

@@ -148,8 +148,8 @@ def disable_recent_activity_header_course_link
       fj('span[role="menuitemradio"]:contains("Recent Activity")').click
       messages = ff("#dashboard .account_notification .notification_message")
       expect(messages.size).to eq 2
-      expect(messages[0].text).to eq a1.message
-      expect(messages[1].text).to eq a2.message
+      expect(messages[0].text).to eq a2.message
+      expect(messages[1].text).to eq a1.message
     end
 
     it "should interpolate the user's domain in global notifications" do