fix merge conflicts of prettier and file names

Author: vahidalizad

.prettierrc

@@ -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);
 

lib/optionsFromArguments.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();

spec/mocks/s3adapter-v2.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', () => {