tests for story merging

4io · Jul 17, 2019 · 6c4bc0b · 6c4bc0b
1 parent 4d377e9
commit 6c4bc0b
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 8 deletions.
diff --git a/app/views/stories/edit.html.erb b/app/views/stories/edit.html.erb
@@ -26,8 +26,7 @@
         </div>
         <% if @story.user_id != @user.id %>
           <div class="boxline">
-            <%= f.label :moderation_reason, "Mod Reason:",
-              :class => "required" %>
+            <%= f.label :moderation_reason, "Mod Reason:", :class => "required" %>
             <%= f.text_field :moderation_reason %>
           </div>
         <% end %>

diff --git a/spec/controllers/stories_controller_spec.rb b/spec/controllers/stories_controller_spec.rb
@@ -2,13 +2,11 @@
 
 describe StoriesController do
   let(:user) { create(:user) }
-
-  before do
-    stub_login_as user
-  end
+  let(:story) { create(:story, user: user) }
+  let(:mod) { create(:user, :moderator) }
 
   describe "#check_url_dupe" do
-    let(:story) { create(:story, user: user) }
+    before { stub_login_as user }
 
     context "json" do
       it "returns similar story matching URL" do
@@ -74,7 +72,7 @@
   end
 
   describe "#delete" do
-    let(:story) { create(:story, user: user) }
+    before { stub_login_as user }
 
     it "increments the user's count of deleted stories" do
       expect {
@@ -84,6 +82,7 @@
   end
 
   describe "#undelete" do
+    before { stub_login_as user }
     let(:deleted_story) { create(:story, :deleted, user: user) }
 
     it "decrements the user's count of deleted stories" do
@@ -92,4 +91,42 @@
       end.to change { user.stories_deleted_count }.by(-1)
     end
   end
+
+  describe "merged stories" do
+    it "can be merged by mod" do
+      stub_login_as mod
+      s = create(:story)
+      post :update, params: {
+        id: s.short_id,
+        story: {
+          merge_story_short_id: story.short_id,
+          moderation_reason: 'cuz',
+        },
+      }
+      expect(response).to be_redirect
+
+      s.reload
+      expect(s.merged_into_story).to eq(story)
+
+      ml = Moderation.last
+      expect(ml.story).to eq(s)
+      expect(ml.reason).to eq('cuz')
+    end
+
+    it "can't be done by submitter" do
+      stub_login_as user
+
+      s = create(:story)
+      post :update, params: {
+        id: s.short_id,
+        story: {
+          merge_story_short_id: story.short_id,
+          moderation_reason: 'anarchy!',
+        },
+      }
+      expect(response).to be_redirect
+      s.reload
+      expect(s.merged_into_story).to be_nil
+    end
+  end
 end
diff --git a/spec/features/read_story_spec.rb b/spec/features/read_story_spec.rb
@@ -28,4 +28,33 @@
       expect(page).to have_content("New reply")
     end
   end
+
+  feature "reading merged stories" do
+    let!(:merged) { create(:story, merged_into_story: story) }
+
+    it "redirects links" do
+      visit merged.comments_path
+      expect(page.current_path).to eq(story.comments_path)
+    end
+
+    it "shows merged story at the top" do
+      visit story.comments_path
+      expect(page).to have_content(merged.title)
+    end
+
+    it "shows comments from merged_into story" do
+      visit story.comments_path
+      expect(page).to have_content(comment.comment)
+    end
+
+    it "shows comments from merged story" do
+      merged_comment = create(:comment, story: merged)
+      merged_reply = create(:comment, story: merged, parent_comment: merged_comment)
+      visit story.comments_path
+
+      expect(page).to have_content(merged_comment.comment)
+      expect(page).to have_content(merged_reply.comment)
+      expect(page).to have_selector('span.merge')
+    end
+  end
 end