You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2018/10/19 09:46:06 UTC
[couchdb-fauxton] branch master updated: Fix fetchDatabaseInfo() to
account for url interceptors (#1143)
This is an automated email from the ASF dual-hosted git repository.
garren 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 7978d8d Fix fetchDatabaseInfo() to account for url interceptors (#1143)
7978d8d is described below
commit 7978d8dd12aab10dca9b09cb7f07b06ad2e18e07
Author: Antonio Maranhao <30...@users.noreply.github.com>
AuthorDate: Fri Oct 19 05:46:01 2018 -0400
Fix fetchDatabaseInfo() to account for url interceptors (#1143)
* Fix fetchDatabaseInfo() to account for url interceptors
* Fix warning msg in notification tests
---
app/addons/documents/partition-key/api.js | 4 +++-
app/addons/fauxton/notifications/__tests__/components.test.js | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/addons/documents/partition-key/api.js b/app/addons/documents/partition-key/api.js
index 720d69f..1cbb9bf 100644
--- a/app/addons/documents/partition-key/api.js
+++ b/app/addons/documents/partition-key/api.js
@@ -11,10 +11,12 @@
// the License.
import '@webcomponents/url';
+import FauxtonAPI from '../../../core/api';
import {get} from '../../../core/ajax';
import Helpers from "../../../helpers";
export const fetchDatabaseInfo = (databaseName) => {
- const url = Helpers.getServerUrl("/" + encodeURIComponent(databaseName));
+ const base = FauxtonAPI.urls('databaseBaseURL', 'server', encodeURIComponent(databaseName));
+ const url = Helpers.getServerUrl(base);
return get(url);
};
diff --git a/app/addons/fauxton/notifications/__tests__/components.test.js b/app/addons/fauxton/notifications/__tests__/components.test.js
index a12b15a..dc59ef4 100644
--- a/app/addons/fauxton/notifications/__tests__/components.test.js
+++ b/app/addons/fauxton/notifications/__tests__/components.test.js
@@ -25,7 +25,7 @@ describe('Notification', () => {
it('startHide is only called after visible time is out', (done) => {
const spy = sinon.spy();
const component = mount(<Notification
- notificationId={'some id'}
+ notificationId={123}
isHiding={false}
key={11}
msg={'a msg'}