From e5b476327fc6002483b5582675c04a471691a8fd Mon Sep 17 00:00:00 2001
From: Cory Forsyth <cory.forsyth@gmail.com>
Date: Wed, 16 Sep 2015 23:15:26 -0400
Subject: [PATCH] Fix all failing tests on Firefox

---
 tests/acceptance/editor-sections-test.js      | 22 ++++++-------------
 .../acceptance/editor-text-expansions-test.js |  4 ++--
 tests/unit/parsers/post-test.js               |  6 +++++
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/tests/acceptance/editor-sections-test.js b/tests/acceptance/editor-sections-test.js
index 733730f65..647d3a4f8 100644
--- a/tests/acceptance/editor-sections-test.js
+++ b/tests/acceptance/editor-sections-test.js
@@ -314,30 +314,22 @@ test('keystroke of delete when cursor is after only char in only marker of secti
 test('keystroke of character in empty section adds character, moves cursor', (assert) => {
   editor = new Editor({mobiledoc: mobileDocWithNoCharacter});
   editor.render(editorElement);
-  const getTextNode = () => editor.element.
-                                  childNodes[0]. // section
-                                  childNodes[0]; // marker
 
-  let textNode = getTextNode();
-  assert.ok(!!textNode, 'precond - gets text node');
-  Helpers.dom.moveCursorTo(textNode, 0);
+  assert.hasElement('#editor p br', 'precond - br tag rendered for empty section');
+  let pNode = $('#editor p')[0];
+
+  // Firefox requires that the cursor be placed explicitly for this test to pass
+  Helpers.dom.moveCursorTo(pNode, 0);
 
   const letter = 'M';
   Helpers.dom.insertText(editor, letter);
 
-  assert.equal(getTextNode().textContent, letter, 'adds character');
-  assert.equal(getTextNode().textContent.length, 1);
-
-  assert.deepEqual(Helpers.dom.getCursorPosition(),
-                  {node: getTextNode(), offset: 1},
-                  `cursor moves to end of ${letter} text node`);
+  assert.hasElement(`#editor p:contains(${letter})`, 'adds char');
 
   const otherLetter = 'X';
   Helpers.dom.insertText(editor, otherLetter);
 
-  assert.equal(getTextNode().textContent, `${letter}${otherLetter}`,
-               'adds character in the correct spot');
-  assert.equal(getTextNode().textContent.length, letter.length + otherLetter.length);
+  assert.hasElement(`#editor p:contains(${letter}${otherLetter})`, 'adds char in correct spot');
 });
 
 test('keystroke of delete at start of section joins with previous section', (assert) => {
diff --git a/tests/acceptance/editor-text-expansions-test.js b/tests/acceptance/editor-text-expansions-test.js
index dcabddc4e..054cdcc28 100644
--- a/tests/acceptance/editor-text-expansions-test.js
+++ b/tests/acceptance/editor-text-expansions-test.js
@@ -7,7 +7,7 @@ let editor, editorElement;
 
 function insertText(text, cursorNode) {
   if (!cursorNode) {
-    cursorNode = $('#editor p:eq(0)')[0].firstChild;
+    cursorNode = $('#editor p:eq(0)')[0];
   }
   Helpers.dom.moveCursorTo(cursorNode);
   Helpers.dom.insertText(editor, text);
@@ -89,7 +89,7 @@ test('typing "* " inside of a list section does not create a new list section',
 
   assert.hasElement('#editor ul > li', 'precond - has li');
 
-  const cursorNode = $('#editor li:eq(0)')[0].firstChild;
+  const cursorNode = $('#editor li:eq(0)')[0];
   insertText('* ', cursorNode);
 
   // note: the actual text is "*&nbsp;", so only check that the "*" is there,
diff --git a/tests/unit/parsers/post-test.js b/tests/unit/parsers/post-test.js
index 72a633825..08e8191e8 100644
--- a/tests/unit/parsers/post-test.js
+++ b/tests/unit/parsers/post-test.js
@@ -80,6 +80,9 @@ test('editor#reparse catches changes to section', (assert) => {
   const p = $('#editor p:eq(0)')[0];
   p.childNodes[0].textContent = 'the NEW marker';
 
+  // In Firefox, changing the text content changes the selection, so re-set it
+  Helpers.dom.moveCursorTo(p.childNodes[0]);
+
   editor.reparse();
 
   const section = editor.post.sections.head;
@@ -104,6 +107,9 @@ test('editor#reparse catches changes to list section', (assert) => {
   const li = $('#editor li:eq(0)')[0];
   li.childNodes[0].textContent = 'the NEW list item';
 
+  // In Firefox, changing the text content changes the selection, so re-set it
+  Helpers.dom.moveCursorTo(li.childNodes[0]);
+
   editor.reparse();
 
   const listItem = editor.post.sections.head.items.head;