couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject fauxton commit: updated refs/heads/master to 52753f1
Date Tue, 23 Jun 2015 03:26:56 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master 9255805ff -> 52753f1f8


Move the click handler to the header

The toggle event was placed one node too high on the Index
section in the sidebar, which resulted in the section being
expanded/contracted when a subelement is clicked, rather than
just the parent.


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/52753f1f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/52753f1f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/52753f1f

Branch: refs/heads/master
Commit: 52753f1f8aa67f80f628b7599f9788417d592778
Parents: 9255805
Author: Ben Keen <ben.keen@gmail.com>
Authored: Mon Jun 22 12:03:42 2015 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Mon Jun 22 19:54:15 2015 -0700

----------------------------------------------------------------------
 app/addons/documents/sidebar/sidebar.react.jsx            | 10 +++++-----
 .../documents/tests/nightwatch/editDocumentsFromView.js   |  5 ++---
 app/addons/documents/tests/nightwatch/previousButton.js   |  2 +-
 app/addons/documents/tests/nightwatch/viewCreate.js       |  4 +++-
 4 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/52753f1f/app/addons/documents/sidebar/sidebar.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/documents/sidebar/sidebar.react.jsx b/app/addons/documents/sidebar/sidebar.react.jsx
index 70e4f53..8e99842 100644
--- a/app/addons/documents/sidebar/sidebar.react.jsx
+++ b/app/addons/documents/sidebar/sidebar.react.jsx
@@ -215,14 +215,14 @@ function (app, FauxtonAPI, React, Stores, Actions, Components, DocumentViews)
{
       var designDocName = this.props.designDocName;
       var linkId = "nav-design-function-" + designDocName + this.props.selector;
       return (
-        <li id={linkId} onClick={this.toggle}>
-          <a className={toggleClassNames} data-toggle="collapse">
+        <li id={linkId}>
+          <a className={toggleClassNames} data-toggle="collapse" onClick={this.toggle}>
             <div className="fonticon-play"></div>
             <span className={icon + " fonticon"}></span>
             {title}
-            </a>
-            <ul className={toggleBodyClassNames}>
-              {this.createItems()}
+          </a>
+          <ul className={toggleBodyClassNames}>
+            {this.createItems()}
           </ul>
         </li>
       );

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/52753f1f/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
index b435e9e..834ed31 100644
--- a/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
+++ b/app/addons/documents/tests/nightwatch/editDocumentsFromView.js
@@ -15,7 +15,6 @@ module.exports = {
     var waitTime = client.globals.maxWaitTime,
         newDatabaseName = client.globals.testDatabaseName,
         newDocumentName = '_design/abc',
-        baseUrl = client.globals.test_settings.launch_url,
         ddocContents = {
           "views": {
             "evens": {
@@ -28,13 +27,13 @@ module.exports = {
 
     client
       .loginToGUI()
-      .createDocument(newDocumentName, newDatabaseName, ddocContents )
+      .createDocument(newDocumentName, newDatabaseName, ddocContents)
       .populateDatabase(newDatabaseName)
 
       //navigate to 'evens' view (declared above), then click on first document's pencil
icon
       .clickWhenVisible('#dashboard-content a[href="#/database/' + newDatabaseName + '/_all_docs"]')
       .clickWhenVisible('#nav-header-abc')
-      .clickWhenVisible('#nav-design-function-abcviews')
+      .clickWhenVisible('#nav-design-function-abcviews a')
       .clickWhenVisible('#abc_evens')
       .clickWhenVisible('a[href="#/database/fauxton-selenium-tests/document_10"]')
 

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/52753f1f/app/addons/documents/tests/nightwatch/previousButton.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/previousButton.js b/app/addons/documents/tests/nightwatch/previousButton.js
index d2ec413..d08e05d 100644
--- a/app/addons/documents/tests/nightwatch/previousButton.js
+++ b/app/addons/documents/tests/nightwatch/previousButton.js
@@ -21,7 +21,7 @@ module.exports = {
       .loginToGUI()
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_changes')
       .clickWhenVisible('#nav-header-keyview')
-      .clickWhenVisible('#nav-design-function-keyviewviews')
+      .clickWhenVisible('#nav-design-function-keyviewviews a')
       .clickWhenVisible('#keyview_keyview')
       .clickWhenVisible('.breadcrumb-back-link .fonticon-left-open')
       .waitForElementPresent('.js-changes-view', waitTime)

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/52753f1f/app/addons/documents/tests/nightwatch/viewCreate.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/viewCreate.js b/app/addons/documents/tests/nightwatch/viewCreate.js
index bc6094e..dcdfc48 100644
--- a/app/addons/documents/tests/nightwatch/viewCreate.js
+++ b/app/addons/documents/tests/nightwatch/viewCreate.js
@@ -116,8 +116,10 @@ module.exports = {
       //go back to all docs
       .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
       .clickWhenVisible('#nav-header-testdesigndoc', waitTime, false)
-      .clickWhenVisible('#nav-design-function-testdesigndocviews', waitTime, false)
+      .clickWhenVisible('#nav-design-function-testdesigndocviews a', waitTime, false)
+      .execute('$("#testdesigndoc_test-new-view")[0].scrollIntoView();')
       .clickWhenVisible('#testdesigndoc_test-new-view', waitTime, false)
+      .execute('$(".save")[0].scrollIntoView();')
       .waitForElementPresent('.prettyprint', waitTime, false)
       .waitForElementNotPresent('.loading-lines', waitTime, false)
       .assert.containsText('.prettyprint', 'enteente')


Mime
View raw message