moved function so auto merge can happen

Author: mrmarcsmith

spec/test.spec.js

@@ -122,16 +122,7 @@ describe('S3Adapter tests', () => {
       expect(options.bucket).toEqual('bucket');
       expect(options.bucketPrefix).toEqual('test/');
     });
-
-    it('should accept options and overrides as args', () => {
-      var confObj = { bucketPrefix: 'test/', bucket: 'bucket-1', secretKey: 'secret-1', accessKey: 'key-1' };
-      var overridesObj = { secretAccessKey: 'secret-2', accessKeyId: 'key-2', params: { Bucket: 'bucket-2' }};
-      var s3 = new S3Adapter(confObj, overridesObj);
-      expect(s3._s3Client.config.accessKeyId).toEqual('key-2');
-      expect(s3._s3Client.config.secretAccessKey).toEqual('secret-2');
-      expect(s3._s3Client.config.params.Bucket).toEqual('bucket-2');
-      expect(s3._bucketPrefix).toEqual('test/');
-    });
+    
     it('should accept options and overrides as an option in args', () => {
       var confObj = { bucketPrefix: 'test/', bucket: 'bucket-1', secretKey: 'secret-1', accessKey: 'key-1' , s3overrides: { secretAccessKey: 'secret-2', accessKeyId: 'key-2', params: { Bucket: 'bucket-2' }} };
       var s3 = new S3Adapter(confObj);
@@ -150,18 +141,17 @@ describe('S3Adapter tests', () => {
       expect(s3._s3Client.config.params.Bucket).toEqual('bucket-2');
       expect(s3._bucketPrefix).toEqual('test/');
     });
-
-    it('should accept overrides without params', () => {
+    
+    it('should accept options and overrides as args', () => {
       var confObj = { bucketPrefix: 'test/', bucket: 'bucket-1', secretKey: 'secret-1', accessKey: 'key-1' };
-      var overridesObj = { secretAccessKey: 'secret-2'};
+      var overridesObj = { secretAccessKey: 'secret-2', accessKeyId: 'key-2', params: { Bucket: 'bucket-2' }};
       var s3 = new S3Adapter(confObj, overridesObj);
-      expect(s3._s3Client.config.accessKeyId).toEqual('key-1');
+      expect(s3._s3Client.config.accessKeyId).toEqual('key-2');
       expect(s3._s3Client.config.secretAccessKey).toEqual('secret-2');
-      expect(s3._s3Client.config.params.Bucket).toEqual('bucket-1');
+      expect(s3._s3Client.config.params.Bucket).toEqual('bucket-2');
       expect(s3._bucketPrefix).toEqual('test/');
     });
   });
-  });
 
   describe('getFileLocation', () => {
     var config = {