فهرست منبع

fix migrate.js

Yuki Takei 6 سال پیش
والد
کامیت
b7d8cdc550
2فایلهای تغییر یافته به همراه5 افزوده شده و 9 حذف شده
  1. 1 5
      config/migrate.js
  2. 4 4
      src/test/config/migrate.test.js

+ 1 - 5
config/migrate.js

@@ -16,12 +16,8 @@ const mongoUri = getMongoUri();
 // parse url
 const url = new URL(mongoUri);
 
-const authStr = (url.username.length > 0 && url.password.length > 0)
-  ? `${url.username}:${url.password}@`
-  : '';
-
 const mongodb = {
-  url: `${url.protocol}//${authStr}${url.host}${url.search}`,
+  url: mongoUri,
   databaseName: url.pathname.substring(1), // omit heading slash
   options: {
     useNewUrlParser: true, // removes a deprecation warning when connecting

+ 4 - 4
src/test/config/migrate.test.js

@@ -7,10 +7,10 @@ describe('config/migrate.js', () => {
 
   /* eslint-disable indent */
   describe.each`
-    MONGO_URI                                         | expectedUrl                                     | expectedDbName
-    ${'mongodb://example.com/growi'}                  | ${'mongodb://example.com'}                      | ${'growi'}
-    ${'mongodb://user:pass@example.com/growi'}        | ${'mongodb://user:pass@example.com'}            | ${'growi'}
-    ${'mongodb://example.com/growi?replicaSet=mySet'} | ${'mongodb://example.com?replicaSet=mySet'}     | ${'growi'}
+    MONGO_URI                                         | expectedUrl                                       | expectedDbName
+    ${'mongodb://example.com/growi'}                  | ${'mongodb://example.com/growi'}                  | ${'growi'}
+    ${'mongodb://user:pass@example.com/growi'}        | ${'mongodb://user:pass@example.com/growi'}        | ${'growi'}
+    ${'mongodb://example.com/growi?replicaSet=mySet'} | ${'mongodb://example.com/growi?replicaSet=mySet'} | ${'growi'}
   `('returns', ({ MONGO_URI, expectedUrl, expectedDbName }) => {
     test(`when 'MONGO_URI' is '${MONGO_URI}`, () => {