[couchdb-fauxton] branch master updated: Nav: Fix potential ID selector collisions

[wi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

willholley pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git


The following commit(s) were added to refs/heads/master by this push:
     new d63631c  Nav: Fix potential ID selector collisions
     new 0893940  Merge pull request #1246 from mhamann/master
d63631c is described below

commit d63631cc081b4e8db965719c535e164720d7dfc9
Author: Matt Hamann <mh...@us.ibm.com>
AuthorDate: Tue Jan 14 12:09:12 2020 -0500

    Nav: Fix potential ID selector collisions
    
    If a design doc is created with a name that conflicts with an
    existing HTML element's ID, it will receive the styling for
    that element in addition to causing invalid HTML.
    
    This change prefixes those IDs in order to ensure they
    are unique.
---
 app/addons/documents/sidebar/components/DesignDoc.js    | 2 +-
 app/addons/documents/tests/nightwatch/viewDelete.js     | 2 +-
 app/addons/documents/tests/nightwatch/viewEdit.js       | 4 ++--
 app/addons/search/tests/nightwatch/deleteSearchIndex.js | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/addons/documents/sidebar/components/DesignDoc.js b/app/addons/documents/sidebar/components/DesignDoc.js
index 9830827..4144ff1 100644
--- a/app/addons/documents/sidebar/components/DesignDoc.js
+++ b/app/addons/documents/sidebar/components/DesignDoc.js
@@ -157,7 +157,7 @@ export default class DesignDoc extends React.Component {
           </div>
         </div>
         <Collapse in={this.props.isExpanded}>
-          <ul className={toggleBodyClassNames} id={this.props.designDocName}>
+          <ul className={toggleBodyClassNames} id={`design-doc-menu-${this.props.designDocName}`}>
             <li className={metadataRowClass}>
               <a href={"#/" + designDocMetaUrl} className="toggle-view accordion-header">
                 Metadata
diff --git a/app/addons/documents/tests/nightwatch/viewDelete.js b/app/addons/documents/tests/nightwatch/viewDelete.js
index d82bb12..335e38e 100644
--- a/app/addons/documents/tests/nightwatch/viewDelete.js
+++ b/app/addons/documents/tests/nightwatch/viewDelete.js
@@ -29,7 +29,7 @@ module.exports = {
       .assert.containsText('.prettyprint', 'stub')
 
       // confirm the sidebar shows the testdesigndoc design doc
-      .waitForElementVisible('#testdesigndoc', waitTime, true)
+      .waitForElementVisible('#design-doc-menu-testdesigndoc', waitTime, true)
 
       .clickWhenVisible('.index-list .active span', waitTime, true)
       .clickWhenVisible('.popover-content .fonticon-trash', waitTime, true)
diff --git a/app/addons/documents/tests/nightwatch/viewEdit.js b/app/addons/documents/tests/nightwatch/viewEdit.js
index 6a1dd41..96cf838 100644
--- a/app/addons/documents/tests/nightwatch/viewEdit.js
+++ b/app/addons/documents/tests/nightwatch/viewEdit.js
@@ -201,7 +201,7 @@ module.exports = {
       .waitForElementPresent('.prettyprint', waitTime, false)
 
       // confirm the sidebar shows the testdesigndoc design doc
-      .waitForElementVisible('#testdesigndoc', waitTime, true)
+      .waitForElementVisible('#design-doc-menu-testdesigndoc', waitTime, true)
 
       .waitForElementPresent('.faux-header__doc-header-title', waitTime, false)
       .waitForAttribute('.faux-header__doc-header-title', 'textContent', function (docContents) {
@@ -234,7 +234,7 @@ module.exports = {
 
       // now wait for the old design doc to be gone, and the new one to have shown up
       .waitForElementNotPresent('#testdesigndoc', waitTime, true)
-      .waitForElementPresent('#brand-new-ddoc', waitTime, true)
+      .waitForElementPresent('#design-doc-menu-brand-new-ddoc', waitTime, true)
       .end();
   }
 
diff --git a/app/addons/search/tests/nightwatch/deleteSearchIndex.js b/app/addons/search/tests/nightwatch/deleteSearchIndex.js
index 9d5e127..3ec44fa 100644
--- a/app/addons/search/tests/nightwatch/deleteSearchIndex.js
+++ b/app/addons/search/tests/nightwatch/deleteSearchIndex.js
@@ -77,7 +77,7 @@ module.exports = {
 
       // just assert the search indexes section has been removed, but the design doc still exists
       .waitForElementNotPresent('#nav-design-function-testdesigndocindexes', waitTime, true)
-      .waitForElementPresent('#testdesigndoc', waitTime, true)
+      .waitForElementPresent('#design-doc-menu-testdesigndoc', waitTime, true)
 
       .end();
   }