Drop .textContent IE8 polyfill and rewrite escaping tests against public API

packages/react-dom/src/__tests__/ReactServerRendering-test.js

@@ -42,13 +42,6 @@ describe('ReactDOMServer', () => {
       expect(response).toMatch(new RegExp('<img data-reactroot=""' + '/>'));
     });
 
-    it('should generate simple markup for attribute with `>` symbol', () => {
-      var response = ReactDOMServer.renderToString(<img data-attr=">" />);
-      expect(response).toMatch(
-        new RegExp('<img data-attr="&gt;" data-reactroot=""' + '/>'),
-      );
-    });
-
     it('should generate comment markup for component returns null', () => {
       class NullComponent extends React.Component {
         render() {

packages/react-dom/src/__tests__/escapeTextForBrowser-test.js

@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2013-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react-core
+ */
+
+'use strict';
+
+var React;
+var ReactDOMServer;
+
+describe('escapeTextForBrowser', () => {
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('react');
+    ReactDOMServer = require('react-dom/server');
+  });
+
+  it('ampersand is escaped when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{'&'}</span>);
+    expect(response).toMatch('<span data-reactroot="">&amp;</span>');
+  });
+
+  it('double quote is escaped when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{'"'}</span>);
+    expect(response).toMatch('<span data-reactroot="">&quot;</span>');
+  });
+
+  it('single quote is escaped when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{"'"}</span>);
+    expect(response).toMatch('<span data-reactroot="">&#x27;</span>');
+  });
+
+  it('greater than entity is escaped when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{'>'}</span>);
+    expect(response).toMatch('<span data-reactroot="">&gt;</span>');
+  });
+
+  it('lower than entity is escaped when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{'<'}</span>);
+    expect(response).toMatch('<span data-reactroot="">&lt;</span>');
+  });
+
+  it('number is correctly passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<span>{42}</span>);
+    expect(response).toMatch('<span data-reactroot="">42</span>');
+  });
+
+  it('number is escaped to string when passed as text content', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr={42} />);
+    expect(response).toMatch('<img data-attr="42" data-reactroot=""/>');
+  });
+
+  it('escape text content representing a script tag', () => {
+    var response = ReactDOMServer.renderToString(
+      <span>{'<script type=\'\' src=""></script>'}</span>,
+    );
+    expect(response).toMatch(
+      '<span data-reactroot="">&lt;script type=&#x27;&#x27; ' +
+        'src=&quot;&quot;&gt;&lt;/script&gt;</span>',
+    );
+  });
+});

packages/react-dom/src/__tests__/quoteAttributeValueForBrowser-test.js

@@ -9,40 +9,67 @@
 
 'use strict';
 
+var React;
+var ReactDOMServer;
+
 describe('quoteAttributeValueForBrowser', () => {
-  // TODO: can we express this test with only public API?
-  var quoteAttributeValueForBrowser = require('../shared/quoteAttributeValueForBrowser')
-    .default;
+  beforeEach(() => {
+    jest.resetModules();
+    React = require('react');
+    ReactDOMServer = require('react-dom/server');
+  });
 
-  it('should escape boolean to string', () => {
-    expect(quoteAttributeValueForBrowser(true)).toBe('"true"');
-    expect(quoteAttributeValueForBrowser(false)).toBe('"false"');
+  it('ampersand is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr="&" />);
+    expect(response).toMatch('<img data-attr="&amp;" data-reactroot=""/>');
   });
 
-  it('should escape object to string', () => {
-    var escaped = quoteAttributeValueForBrowser({
-      toString: function() {
-        return 'ponys';
-      },
-    });
+  it('double quote is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr={'"'} />);
+    expect(response).toMatch('<img data-attr="&quot;" data-reactroot=""/>');
+  });
+
+  it('single quote is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr="'" />);
+    expect(response).toMatch('<img data-attr="&#x27;" data-reactroot=""/>');
+  });
 
-    expect(escaped).toBe('"ponys"');
+  it('greater than entity is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr=">" />);
+    expect(response).toMatch('<img data-attr="&gt;" data-reactroot=""/>');
   });
 
-  it('should escape number to string', () => {
-    expect(quoteAttributeValueForBrowser(42)).toBe('"42"');
+  it('lower than entity is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr="<" />);
+    expect(response).toMatch('<img data-attr="&lt;" data-reactroot=""/>');
   });
 
-  it('should escape string', () => {
-    var escaped = quoteAttributeValueForBrowser(
-      '<script type=\'\' src=""></script>',
+  it('number is escaped to string inside attributes', () => {
+    var response = ReactDOMServer.renderToString(<img data-attr={42} />);
+    expect(response).toMatch('<img data-attr="42" data-reactroot=""/>');
+  });
+
+  it('object is passed to a string inside attributes', () => {
+    var sampleObject = {
+      toString: function() {
+        return 'ponys';
+      },
+    };
+
+    var response = ReactDOMServer.renderToString(
+      <img data-attr={sampleObject} />,
     );
-    expect(escaped).not.toContain('<');
-    expect(escaped).not.toContain('>');
-    expect(escaped).not.toContain("'");
-    expect(escaped.substr(1, -1)).not.toContain('"');
+    expect(response).toMatch('<img data-attr="ponys" data-reactroot=""/>');
+  });
 
-    escaped = quoteAttributeValueForBrowser('&');
-    expect(escaped).toBe('"&amp;"');
+  it('script tag is escaped inside attributes', () => {
+    var response = ReactDOMServer.renderToString(
+      <img data-attr={'<script type=\'\' src=""></script>'} />,
+    );
+    expect(response).toMatch(
+      '<img data-attr="&lt;script type=&#x27;&#x27; ' +
+        'src=&quot;&quot;&gt;&lt;/script&gt;" ' +
+        'data-reactroot=""/>',
+    );
   });
 });

packages/react-dom/src/client/setTextContent.js

@@ -5,10 +5,6 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
-
-import setInnerHTML from './setInnerHTML';
-import escapeTextContentForBrowser from '../shared/escapeTextContentForBrowser';
 import {TEXT_NODE} from '../shared/HTMLNodeType';
 
 /**
@@ -37,16 +33,4 @@ let setTextContent = function(node, text) {
   node.textContent = text;
 };
 
-if (ExecutionEnvironment.canUseDOM) {
-  if (!('textContent' in document.documentElement)) {
-    setTextContent = function(node, text) {
-      if (node.nodeType === TEXT_NODE) {
-        node.nodeValue = text;
-        return;
-      }
-      setInnerHTML(node, escapeTextContentForBrowser(text));
-    };
-  }
-}
-
 export default setTextContent;

packages/react-dom/src/server/DOMMarkupOperations.js

@@ -14,7 +14,7 @@ import {
   shouldAttributeAcceptBooleanValue,
   shouldSetAttribute,
 } from '../shared/DOMProperty';
-import quoteAttributeValueForBrowser from '../shared/quoteAttributeValueForBrowser';
+import quoteAttributeValueForBrowser from './quoteAttributeValueForBrowser';
 import warning from 'fbjs/lib/warning';
 
 // isAttributeNameSafe() is currently duplicated in DOMPropertyOperations.

packages/react-dom/src/server/ReactPartialRenderer.js

@@ -26,6 +26,7 @@ import {
   createMarkupForProperty,
   createMarkupForRoot,
 } from './DOMMarkupOperations';
+import escapeTextForBrowser from './escapeTextForBrowser';
 import {
   Namespaces,
   getIntrinsicNamespace,
@@ -34,7 +35,6 @@ import {
 import ReactControlledValuePropTypes from '../shared/ReactControlledValuePropTypes';
 import assertValidProps from '../shared/assertValidProps';
 import dangerousStyleValue from '../shared/dangerousStyleValue';
-import escapeTextContentForBrowser from '../shared/escapeTextContentForBrowser';
 import isCustomComponent from '../shared/isCustomComponent';
 import omittedCloseTags from '../shared/omittedCloseTags';
 import warnValidStyle from '../shared/warnValidStyle';
@@ -204,7 +204,7 @@ function getNonChildrenInnerMarkup(props) {
   } else {
     var content = props.children;
     if (typeof content === 'string' || typeof content === 'number') {
-      return escapeTextContentForBrowser(content);
+      return escapeTextForBrowser(content);
     }
   }
   return null;
@@ -572,13 +572,13 @@ class ReactDOMServerRenderer {
         return '';
       }
       if (this.makeStaticMarkup) {
-        return escapeTextContentForBrowser(text);
+        return escapeTextForBrowser(text);
       }
       if (this.previousWasTextNode) {
-        return '<!-- -->' + escapeTextContentForBrowser(text);
+        return '<!-- -->' + escapeTextForBrowser(text);
       }
       this.previousWasTextNode = true;
-      return escapeTextContentForBrowser(text);
+      return escapeTextForBrowser(text);
     } else {
       var nextChild;
       ({child: nextChild, context} = resolve(child, context));

packages/react-dom/src/shared/escapeTextContentForBrowser.js → packages/react-dom/src/server/escapeTextForBrowser.js

@@ -39,9 +39,9 @@
 var matchHtmlRegExp = /["'&<>]/;
 
 /**
- * Escape special characters in the given string of html.
+ * Escapes special characters and HTML entities in a given html string.
  *
- * @param  {string} string The string to escape for inserting into HTML
+ * @param  {string} string HTML string to escape for later insertion
  * @return {string}
  * @public
  */
@@ -98,7 +98,7 @@ function escapeHtml(string) {
  * @param {*} text Text value to escape.
  * @return {string} An escaped string.
  */
-function escapeTextContentForBrowser(text) {
+function escapeTextForBrowser(text) {
   if (typeof text === 'boolean' || typeof text === 'number') {
     // this shortcircuit helps perf for types that we know will never have
     // special characters, especially given that this function is used often
@@ -108,4 +108,4 @@ function escapeTextContentForBrowser(text) {
   return escapeHtml(text);
 }
 
-export default escapeTextContentForBrowser;
+export default escapeTextForBrowser;

packages/react-dom/src/shared/quoteAttributeValueForBrowser.js → packages/react-dom/src/server/quoteAttributeValueForBrowser.js

@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import escapeTextContentForBrowser from './escapeTextContentForBrowser';
+import escapeTextForBrowser from './escapeTextForBrowser';
 
 /**
  * Escapes attribute value to prevent scripting attacks.
@@ -14,7 +14,7 @@ import escapeTextContentForBrowser from './escapeTextContentForBrowser';
  * @return {string} An escaped string.
  */
 function quoteAttributeValueForBrowser(value) {
-  return '"' + escapeTextContentForBrowser(value) + '"';
+  return '"' + escapeTextForBrowser(value) + '"';
 }
 
 export default quoteAttributeValueForBrowser;