Merge pull request #1246 from mhamann/master

Nav: Fix potential ID selector collisions
apache · Feb 1, 2020 · 0893940 · 0893940
2 parents 5b27487 + d63631c
commit 0893940
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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();
   }