fix merge conflicts of prettier and file names

parse-community · Oct 22, 2024 · 82bef30 · 82bef30
1 parent a71372a
commit 82bef30
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 77 deletions.
diff --git a/.prettierrc b/.prettierrc
diff --git a/lib/optionsFromArguments.js b/lib/optionsFromArguments.js
@@ -95,19 +95,9 @@ const optionsFromArguments = function optionsFromArguments(args) {
   options = fromEnvironmentOrDefault(options, 'baseUrl', 'S3_BASE_URL', null);
   options = fromEnvironmentOrDefault(options, 'baseUrlDirect', 'S3_BASE_URL_DIRECT', false);
   options = fromEnvironmentOrDefault(options, 'signatureVersion', 'S3_SIGNATURE_VERSION', 'v4');
-  options = fromEnvironmentOrDefault(
-    options,
-    'globalCacheControl',
-    'S3_GLOBAL_CACHE_CONTROL',
-    null
-  );
+  options = fromEnvironmentOrDefault(options, 'globalCacheControl', 'S3_GLOBAL_CACHE_CONTROL', null);
   options = fromEnvironmentOrDefault(options, 'presignedUrl', 'S3_PRESIGNED_URL', false);
-  options = fromEnvironmentOrDefault(
-    options,
-    'presignedUrlExpires',
-    'S3_PRESIGNED_URL_EXPIRES',
-    null
-  );
+  options = fromEnvironmentOrDefault(options, 'presignedUrlExpires', 'S3_PRESIGNED_URL_EXPIRES', null);
   options = fromOptionsDictionaryOrDefault(options, 'generateKey', null);
   options = fromOptionsDictionaryOrDefault(options, 'validateFilename', null);
 

diff --git a/spec/mocks/s3adapter-v2.js b/spec/mocks/s3adapter-v2.js
diff --git a/spec/mocks/s3adapter-v3.js → spec/mocks/s3adapter.js b/spec/mocks/s3adapter-v3.js → spec/mocks/s3adapter.js
diff --git a/spec/support/server.js b/spec/support/server.js
@@ -1,7 +1,7 @@
 const { ParseServer } = require('parse-server');
 const express = require('express');
 const http = require('http');
-const { getMockS3Adapter } = require('../mocks/s3adapter-v3');
+const { getMockS3Adapter } = require('../mocks/s3adapter.js');
 const Config = require('../../node_modules/parse-server/lib/Config.js');
 
 const expressApp = express();

diff --git a/spec/test.spec.js b/spec/test.spec.js
@@ -4,7 +4,7 @@ const config = require('config');
 const S3Adapter = require('../index');
 const optionsFromArguments = require('../lib/optionsFromArguments');
 const { GetObjectCommand, PutObjectCommand, CreateBucketCommand } = require('@aws-sdk/client-s3');
-const { getMockS3Adapter } = require('./mocks/s3adapter-v3');
+const { getMockS3Adapter } = require('./mocks/s3adapter');
 
 
 describe('S3Adapter tests', () => {