From 287e780f223247e52ac4e74c5ea936a81a3fa0ba Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 18 Oct 2018 11:05:47 +0800
Subject: [PATCH] DEV: Skip tests instead of commenting out.

---
 .../composer-edit-conflict-test.js.es6        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6 b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
index 7936bc26b3c..9cd0eb104b1 100644
--- a/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
+++ b/test/javascripts/acceptance/composer-edit-conflict-test.js.es6
@@ -1,25 +1,25 @@
-// import { acceptance } from "helpers/qunit-helpers";
+import { acceptance } from "helpers/qunit-helpers";
 
-// acceptance("Composer - Edit conflict", {
-//   loggedIn: true,
+acceptance("Composer - Edit conflict", {
+  loggedIn: true,
 
-//   pretend(server, helper) {
-//     server.put("/posts/18", () => {
-//       return helper.response(409, { errors: ["edit conflict"] });
-//     });
-//   }
-// });
+  pretend(server, helper) {
+    server.put("/posts/18", () => {
+      return helper.response(409, { errors: ["edit conflict"] });
+    });
+  }
+});
 
-// QUnit.test("Edit a post that causes an edit conflict", async assert => {
-//   await visit("/t/this-is-a-test-topic/9");
-//   await click(".topic-post:eq(0) button.show-more-actions");
-//   await click(".topic-post:eq(0) button.edit");
-//   await click("#reply-control button.create");
-//   assert.equal(
-//     find("#reply-control button.create")
-//       .text()
-//       .trim(),
-//     I18n.t("composer.overwrite_edit"),
-//     "it shows the overwrite button"
-//   );
-// });
+QUnit.skip("Edit a post that causes an edit conflict", async assert => {
+  await visit("/t/this-is-a-test-topic/9");
+  await click(".topic-post:eq(0) button.show-more-actions");
+  await click(".topic-post:eq(0) button.edit");
+  await click("#reply-control button.create");
+  assert.equal(
+    find("#reply-control button.create")
+      .text()
+      .trim(),
+    I18n.t("composer.overwrite_edit"),
+    "it shows the overwrite button"
+  );
+});