diff -r 000000000000 -r 6474c204b198 browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/browser/devtools/styleinspector/test/browser_ruleview_edit-property-commit.js	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,84 @@
+/* vim: set ft=javascript ts=2 et sw=2 tw=80: */
+/* Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Test original value is correctly displayed when ESCaping out of the
+// inplace editor in the style inspector.
+
+const originalValue = "#00F";
+
+// Test data format
+// {
+//  value: what char sequence to type,
+//  commitKey: what key to type to "commit" the change,
+//  modifiers: commitKey modifiers,
+//  expected: what value is expected as a result
+// }
+const testData = [
+  {value: "red", commitKey: "VK_ESCAPE", modifiers: {}, expected: originalValue},
+  {value: "red", commitKey: "VK_RETURN", modifiers: {}, expected: "#F00"},
+  {value: "invalid", commitKey: "VK_RETURN", modifiers: {}, expected: "invalid"},
+  {value: "blue", commitKey: "VK_TAB", modifiers: {shiftKey: true}, expected: "blue"}
+];
+
+let test = asyncTest(function*() {
+  yield addTab("data:text/html,test escaping property change reverts back to original value");
+
+  info("Creating the test document");
+  createDocument();
+
+  info("Opening the rule view");
+  let {toolbox, inspector, view} = yield openRuleView();
+
+  info("Selecting the test node");
+  yield selectNode("#testid", inspector);
+
+  info("Iterating over the test data");
+  for (let data of testData) {
+    yield runTestData(view, data);
+  }
+});
+
+function createDocument() {
+  let style = '' +
+    '#testid {' +
+    '  color: ' + originalValue + ';' +
+    '}';
+
+  let node = content.document.createElement('style');
+  node.setAttribute("type", "text/css");
+  node.textContent = style;
+  content.document.getElementsByTagName("head")[0].appendChild(node);
+
+  content.document.body.innerHTML = '<div id="testid">Styled Node</div>';
+}
+
+function* runTestData(view, {value, commitKey, modifiers, expected}) {
+  let idRuleEditor = view.element.children[1]._ruleEditor;
+  let propEditor = idRuleEditor.rule.textProps[0].editor;
+
+  info("Focusing the inplace editor field");
+  let editor = yield focusEditableField(propEditor.valueSpan);
+  is(inplaceEditor(propEditor.valueSpan), editor, "Focused editor should be the value span.");
+
+  info("Entering test data " + value)
+  for (let ch of value) {
+    EventUtils.sendChar(ch, view.doc.defaultView);
+  }
+
+  info("Waiting for focus on the field");
+  let onBlur = once(editor.input, "blur");
+
+  info("Entering the commit key " + commitKey + " " + modifiers);
+  EventUtils.synthesizeKey(commitKey, modifiers);
+  yield onBlur;
+
+  if (commitKey === "VK_ESCAPE") {
+    is(propEditor.valueSpan.textContent, expected, "Value is as expected: " + expected);
+  } else {
+    yield once(view.element, "CssRuleViewChanged");
+    is(propEditor.valueSpan.textContent, expected, "Value is as expected: " + expected);
+  }
+}