Refactred test cases for browsers - drop key based cases from browser testing scope

Author: XiaoningLiu

browser/test/blob/blobservice-upload.js

@@ -30,7 +30,7 @@ if (testUtil.isBrowser()) {
 
     describe('BlobServiceUpload', function () {
         before(function (done) {
-            blobService = azure.createBlobService(process.env['AZURE_STORAGE_CONNECTION_STRING']);
+            blobService = testUtil.getBlobService(azure);
             assert.notEqual(null, blobService, 'blobService should not be null');
 
             containerName = suite.getName(containerNamesPrefix);

browser/test/bundle.js

@@ -39,20 +39,13 @@ var bs = browserify([
     path.resolve(__dirname, '../../test/services/file/fileservice-sse-tests.js'),
     path.resolve(__dirname, '../../test/services/file/fileservice-tests.js'),
     path.resolve(__dirname, '../../test/services/file/fileservice-uploaddownload-tests.js'),
-    path.resolve(__dirname, '../../test/common/connectionstringparsertests.js'),
-    path.resolve(__dirname, '../../test/common/secondarytests.js'),
-    path.resolve(__dirname, '../../test/common/servicesettingstests.js'),
-    path.resolve(__dirname, '../../test/common/servicestatstests.js'),
-    path.resolve(__dirname, '../../test/common/sharedkey-tests.js'),
     path.resolve(__dirname, '../../test/common/storageserviceclienttests.js'),
-    path.resolve(__dirname, '../../test/common/storageservicesettingstests.js'),
     path.resolve(__dirname, '../../test/common/filters/exponentialretrypolicyfilter-tests.js'),
     path.resolve(__dirname, '../../test/common/filters/linearretrypolicyfilter-tests.js'),
     path.resolve(__dirname, '../../test/common/util/iso8061date-tests.js'),
     path.resolve(__dirname, '../../test/common/util/util-tests.js'),
     path.resolve(__dirname, '../../test/common/util/validate-tests.js'),
     path.resolve(__dirname, '../../test/azure-tests.js'),
-    path.resolve(__dirname, '../../test/accountsas-tests.js'),
     path.resolve(__dirname, './file/fileservice-upload.js'),
     path.resolve(__dirname, './blob/blobservice-upload.js')
 ], { require: ['https'] }).bundle();

browser/test/file/fileservice-upload.js

@@ -30,7 +30,7 @@ if (testUtil.isBrowser()) {
 
   describe('FileServiceUpload', function () {
     before(function (done) {
-      fileService = azure.createFileService(process.env['AZURE_STORAGE_CONNECTION_STRING']);
+      fileService = testUtil.getFileService(azure);
       assert.notEqual(null, fileService, 'FileService should not be null');
 
       shareName = suite.getName(shareNamesPrefix);

karma.conf.js

@@ -40,10 +40,8 @@ module.exports = function (config) {
     // environment values MUST be exported or set with same console running "karma start"
     // https://www.npmjs.com/package/karma-env-preprocessor
     envPreprocessor: [
-      'AZURE_STORAGE_CONNECTION_STRING',
-      'AZURE_STORAGE_CONNECTION_STRING_SSE_ENABLED_ACCOUNT',
-      'AZURE_STORAGE_CONNECTION_STRING_BLOB_ACCOUNT',
-      'AZURE_STORAGE_CONNECTION_STRING_PREMIUM_ACCOUNT'
+      'AZURE_ACCOUNT',
+      'AZURE_SAS'
     ],
 
     // test results reporter to use

test/azure-tests.js

@@ -148,7 +148,7 @@ describe('azure', function () {
     assert.strictEqual(queueServiceWithTokenCredential.storageCredentials.tokenCredential.get(), 'renewed');
   });
 
-  it('NotEmulatedExplicitCredentials', function (done) {
+  skipBrowser('NotEmulatedExplicitCredentials', function (done) {
     // Make sure is not emulated
     delete process.env[StorageServiceClientConstants.EnvironmentVariables.EMULATED];
 
@@ -172,7 +172,7 @@ describe('azure', function () {
     done();
   });
 
-  it('EmulatedExplicitCredentials', function (done) {
+  skipBrowser('EmulatedExplicitCredentials', function (done) {
     // set emulated to true
     process.env[StorageServiceClientConstants.EnvironmentVariables.EMULATED] = "true";
 

test/common/filters/exponentialretrypolicyfilter-tests.js

@@ -62,7 +62,7 @@ describe('exponentialretrypolicyfilter-tests', function () {
     }
     suite.setupSuite(function () {
       exponentialRetryPolicyFilter = new ExponentialRetryPolicyFilter();
-      tableService = azure.createTableService(process.env['AZURE_STORAGE_CONNECTION_STRING']).withFilter(exponentialRetryPolicyFilter);
+      tableService = testutil.getTableService(azure).withFilter(exponentialRetryPolicyFilter);
       done();
     });
   });

test/common/filters/linearretrypolicyfilter-tests.js

@@ -48,7 +48,7 @@ describe('linearretrypolicyfilter-tests', function () {
     }
     suite.setupSuite(function () {
       linearRetryPolicyFilter = new LinearRetryPolicyFilter();
-      tableService = azure.createTableService(process.env['AZURE_STORAGE_CONNECTION_STRING']).withFilter(linearRetryPolicyFilter);
+      tableService = testutil.getTableService(azure).withFilter(linearRetryPolicyFilter);
       done();
     });
   });

test/common/storageserviceclienttests.js

@@ -33,7 +33,7 @@ var skipBrowser = testutil.itSkipBrowser();
 
 describe('StorageServiceClientTests', function () {
 
-  it('devStore', function (done) {
+  skipBrowser('devStore', function (done) {
     var devStoreCreds = azure.generateDevelopmentStorageCredentials();
     var devStoreBlobService = azure.createBlobService(devStoreCreds);
 

test/common/util/validate-tests.js

@@ -20,6 +20,21 @@ var assert = require('assert');
 var testutil = require('../../framework/util');
 var Validate = require('../../../lib/common/util/validate');
 
+if (!String.prototype.includes) {
+  String.prototype.includes = function(search, start) {
+    'use strict';
+    if (typeof start !== 'number') {
+      start = 0;
+    }
+
+    if (start + search.length > this.length) {
+      return false;
+    } else {
+      return this.indexOf(search, start) !== -1;
+    }
+  };
+}
+
 describe('validator-tests', function () {
   it('isValidEnumValue should work', function (done) {
     Validate.isValidEnumValue('a', ['a', 'b', 'c']).should.be.ok;
@@ -28,7 +43,7 @@ describe('validator-tests', function () {
         Validate.isValidEnumValue('d', ['a', 'b', 'c']);
       },
       function(err) {
-        return (err instanceof RangeError) && err.message === 'Invalid value: d. Options are: a,b,c.';
+        return (err instanceof RangeError) && err.message.includes('Invalid value: d. Options are');
       }
     );
     done();
@@ -302,7 +317,7 @@ describe('validator-tests', function () {
         Validate.blobTypeIsValid('something');
       },
       function(err) {
-        return (err instanceof RangeError) && err.message === 'Invalid value: something. Options are: BlockBlob,PageBlob,AppendBlob.';
+        return (err instanceof RangeError) && err.message.includes('Invalid value: something. Options are:');
       }
     );
     done();

test/framework/test-suite.js

@@ -20,6 +20,7 @@ var os = require('os');
 var path = require('path');
 var guid = require('uuid');
 var nockHelper = require('./nock-helper');
+var testutil = require('./util');
 
 exports = module.exports = TestSuite;
 
@@ -50,6 +51,20 @@ function TestSuite(testPrefix, env, forceMocked) {
     secure: stripAccessKey,
     optional: true
   }];
+
+  if (testutil.isBrowser()) {
+    requiredEnvironment = [{
+        name: 'AZURE_ACCOUNT',
+        secure: stripAccessKey,
+        optional: false
+      },{
+        name: 'AZURE_SAS',
+        secure: stripAccessKey,
+        optional: false
+      }
+    ]
+  }
+
   env = env.concat(requiredEnvironment);
 
   this.testPrefix = testPrefix;
@@ -77,6 +92,8 @@ function TestSuite(testPrefix, env, forceMocked) {
     process.env['AZURE_STORAGE_CONNECTION_STRING'] = window.__env__['AZURE_STORAGE_CONNECTION_STRING'];
     process.env['AZURE_STORAGE_CONNECTION_STRING_SSE_ENABLED_ACCOUNT'] = window.__env__['AZURE_STORAGE_CONNECTION_STRING_SSE_ENABLED_ACCOUNT'];
     process.env['AZURE_STORAGE_CONNECTION_STRING_BLOB_ACCOUNT'] = window.__env__['AZURE_STORAGE_CONNECTION_STRING_BLOB_ACCOUNT'];
+    process.env['AZURE_ACCOUNT'] = window.__env__['AZURE_ACCOUNT'];
+    process.env['AZURE_SAS'] = window.__env__['AZURE_SAS'];
 
     // Premium blob storage account doesn't support CORS currently
     // process.env['AZURE_STORAGE_CONNECTION_STRING_PREMIUM_ACCOUNT'] = window.__env__['AZURE_STORAGE_CONNECTION_STRING_PREMIUM_ACCOUNT'];