Backed out changeset c4096b7ccbe6 for landing with the wrong commit message.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 21 Jun 2016 17:33:55 -0400
changeset 327258 a8a24cecef9d76e3200e16edab8dffdecc774e62
parent 327257 6cb5178d51b3980a46c1719ce3ad74757307c44a
child 327259 edcca1bcdb7980c166418dd6254eb854e5ed6645
push id9858
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 14:37:10 +0000
treeherdermozilla-aurora@203106ef6cb6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone50.0a1
backs outc4096b7ccbe6e8296e3274841c978efbc5396c64
Backed out changeset c4096b7ccbe6 for landing with the wrong commit message.
devtools/client/shared/components/reps/date-time.js
devtools/client/shared/components/test/mochitest/chrome.ini
devtools/client/shared/components/test/mochitest/test_reps_date-time.html
--- a/devtools/client/shared/components/reps/date-time.js
+++ b/devtools/client/shared/components/reps/date-time.js
@@ -23,17 +23,17 @@ define(function (require, exports, modul
   let DateTime = React.createClass({
     displayName: "Date",
 
     propTypes: {
       object: React.PropTypes.object.isRequired
     },
 
     getTitle: function (grip) {
-      return new Date(grip.preview.timestamp).toISOString();
+      return new Date(grip.preview.timestamp).toString();
     },
 
     render: function () {
       let grip = this.props.object;
       return (
         ObjectLink({className: "Date"},
           span({className: "objectTitle"},
             this.getTitle(grip)
--- a/devtools/client/shared/components/test/mochitest/chrome.ini
+++ b/devtools/client/shared/components/test/mochitest/chrome.ini
@@ -1,17 +1,16 @@
 [DEFAULT]
 support-files =
   head.js
 
 [test_HSplitBox_01.html]
 [test_notification_box_01.html]
 [test_notification_box_02.html]
 [test_notification_box_03.html]
-[test_reps_date-time.html]
 [test_reps_object-with-url.html]
 [test_reps_undefined.html]
 [test_reps_window.html]
 [test_frame_01.html]
 [test_tree_01.html]
 [test_tree_02.html]
 [test_tree_03.html]
 [test_tree_04.html]
deleted file mode 100644
--- a/devtools/client/shared/components/test/mochitest/test_reps_date-time.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-<!DOCTYPE HTML>
-<html>
-<!--
-Test DateTime rep
--->
-<head>
-  <meta charset="utf-8">
-  <title>Rep test - DateTime</title>
-  <script type="application/javascript" src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="chrome://mochikit/content/tests/SimpleTest/test.css">
-</head>
-<body>
-<pre id="test">
-<script src="head.js" type="application/javascript;version=1.8"></script>
-<script type="application/javascript;version=1.8">
-window.onload = Task.async(function* () {
-  try {
-    let { Rep } = browserRequire("devtools/client/shared/components/reps/rep");
-    let { DateTime } = browserRequire("devtools/client/shared/components/reps/date-time");
-
-    let gripStub = {
-      "type": "object",
-      "class": "Date",
-      "actor": "server1.conn0.child1/obj32",
-      "extensible": true,
-      "frozen": false,
-      "sealed": false,
-      "ownPropertyLength": 0,
-      "preview": {
-        "timestamp": 1459372644859
-      }
-    };
-
-    // Test that correct rep is chosen
-    const renderedRep = shallowRenderComponent(Rep, { object: gripStub });
-    is(renderedRep.type, DateTime.rep, `Rep correctly selects ${DateTime.rep.displayName}`);
-
-    // Test rendering
-    const renderedComponent = renderComponent(DateTime.rep, { object: gripStub });
-    is(renderedComponent.textContent, "2016-03-30T21:17:24.859Z", "DateTime rep has expected text content");
-  } catch(e) {
-    ok(false, "Got an error: " + DevToolsUtils.safeErrorString(e));
-  } finally {
-    SimpleTest.finish();
-  }
-});
-</script>
-</pre>
-</body>
-</html>