Просмотр исходного кода

BugFix SearchboxDelegator.getConnectionInfo()

Yuki Takei 6 лет назад
Родитель
Сommit
f58be2b19a

+ 1 - 1
src/server/service/search-delegator/searchbox.js

@@ -13,7 +13,7 @@ class SearchboxDelegator extends ElasticsearchDelegator {
     const url = new URL(searchboxSslUrl);
     const url = new URL(searchboxSslUrl);
 
 
     const indexName = 'crowi';
     const indexName = 'crowi';
-    const host = `${url.protocol}//${url.auth}${url.hostname}:443`;
+    const host = `${url.protocol}//${url.username}:${url.password}@${url.host}:443`;
 
 
     return {
     return {
       host,
       host,

+ 36 - 0
src/test/service/search-delegator/searchbox.test.js

@@ -0,0 +1,36 @@
+const SearchboxDelegator = require('@server/service/search-delegator/searchbox');
+
+describe('SearchboxDelegator test', () => {
+
+  let delegator;
+
+  describe('getConnectionInfo()', () => {
+
+    let configManagerMock;
+    let searchEventMock;
+
+    beforeEach(() => {
+      configManagerMock = {};
+      searchEventMock = {};
+
+      // setup mock
+      configManagerMock.getConfig = jest.fn()
+        .mockReturnValue('https://paas:7e530aafad58c892a8778827ae80c879@thorin-us-east-1.searchly.com');
+
+      delegator = new SearchboxDelegator(configManagerMock, searchEventMock);
+    });
+
+    test('returns expected object', async() => {
+
+      const { host, httpAuth, indexName } = delegator.getConnectionInfo();
+
+      expect(configManagerMock.getConfig).toHaveBeenCalledWith('crowi', 'app:searchboxSslUrl');
+      expect(host).toBe('https://paas:7e530aafad58c892a8778827ae80c879@thorin-us-east-1.searchly.com:443');
+      expect(httpAuth).toBe('');
+      expect(indexName).toBe('crowi');
+    });
+
+  });
+
+
+});