Revert "Moved success message and updated inbox test"

This reverts commit 416e0e2.

Reverting accidental commit to master

Author: talvalin

app/controllers/inbox_controller.rb

@@ -42,10 +42,10 @@ def update
       elsif params[:delete]
         @inbox_comments.each { |i| i.destroy }
       end
-      success_message = ts('Inbox successfully updated.')
     rescue
-      flash[:caution] = ts("Please select something first.")
+      flash[:caution] = ts("Please select something first")
     end
+    success_message = ts('Inbox successfully updated.')
     respond_to do |format|
       format.html { redirect_to request.referer || user_inbox_path(@user, page: params[:page], filters: params[:filters]), notice: success_message }
       format.json { render json: { item_success_message: success_message }, status: :ok }

spec/controllers/inbox_controller_spec.rb

@@ -271,15 +271,19 @@
       before { fake_login_known_user(user) }
 
       context "with no comments selected" do
-        it "redirects to the user's inbox with a caution" do
+        it "redirects to inbox with caution and a notice" do
           put :update, params: { user_id: user.login, read: "yeah" }
-          it_redirects_to_with_caution(user_inbox_path(user), "Please select something first.")
+          it_redirects_to_with_caution_and_notice(user_inbox_path(user),
+                                                  "Please select something first",
+                                                  "Inbox successfully updated.")
         end
 
-        it "redirects to the previously viewed page if HTTP_REFERER is set, with a caution" do
+        it "redirects to the previously viewed page if HTTP_REFERER is set, with a caution and a notice" do
           @request.env["HTTP_REFERER"] = root_path
           put :update, params: { user_id: user.login, read: "yeah" }
-          it_redirects_to_with_caution(root_path, "Please select something first.")
+          it_redirects_to_with_caution_and_notice(root_path,
+                                                  "Please select something first",
+                                                  "Inbox successfully updated.")
         end
       end