serverless#3184 Refactor tests with await and before step

mnapoli · Sep 24, 2020 · b26eeee · b26eeee
1 parent 185b4e8
commit b26eeee
Showing 1 changed file with 33 additions and 49 deletions.
diff --git a/lib/classes/Variables.test.js b/lib/classes/Variables.test.js
@@ -1360,55 +1360,6 @@ module.exports = {
         .populateProperty(property)
         .should.eventually.eql('my stage is dev');
     });
-
-    it('should support ${file(...)} syntax', () => {
-      return runServerless({
-        fixture: 'variables',
-        cliArgs: ['print'],
-      }).then(result => {
-        expect(result.serverless.service.custom.importedFile).to.deep.equal({
-          foo: 'bar',
-        });
-      });
-    });
-
-    it('should support ${file(...):key} syntax', () => {
-      return runServerless({
-        fixture: 'variables',
-        cliArgs: ['print'],
-      }).then(result => {
-        expect(result.serverless.service.custom.importedFileWithKey).to.equal('bar');
-      });
-    });
-
-    it('should ignore native CloudFormation variables', () => {
-      return runServerless({
-        fixture: 'variables',
-        cliArgs: ['print'],
-      }).then(result => {
-        expect(result.serverless.service.custom.awsVariable).to.equal('${AWS::Region}');
-      });
-    });
-
-    it('should ignore CloudFormation references', () => {
-      return runServerless({
-        fixture: 'variables',
-        cliArgs: ['print'],
-      }).then(result => {
-        expect(result.serverless.service.custom.cloudFormationReference).to.equal(
-          '${AnotherResource}'
-        );
-      });
-    });
-
-    it('should support ${self:key} syntax', () => {
-      return runServerless({
-        fixture: 'variables',
-        cliArgs: ['print'],
-      }).then(result => {
-        expect(result.serverless.service.custom.selfReference).to.equal('bar');
-      });
-    });
   });
 
   describe('#populateVariable()', () => {
@@ -2786,4 +2737,37 @@ module.exports = {
       expect(logWarningSpy.args[0][0]).to.contain('file');
     });
   });
+
+  describe('variable syntax', () => {
+    let processedConfig = null;
+    before(async () => {
+      const result = await runServerless({
+        fixture: 'variables',
+        cliArgs: ['print'],
+      });
+      processedConfig = result.serverless.service;
+    });
+
+    it('should support ${file(...)} syntax', () => {
+      expect(processedConfig.custom.importedFile).to.deep.equal({
+        foo: 'bar',
+      });
+    });
+
+    it('should support ${file(...):key} syntax', () => {
+      expect(processedConfig.custom.importedFileWithKey).to.equal('bar');
+    });
+
+    it('should ignore native CloudFormation variables', () => {
+      expect(processedConfig.custom.awsVariable).to.equal('${AWS::Region}');
+    });
+
+    it('should ignore CloudFormation references', () => {
+      expect(processedConfig.custom.cloudFormationReference).to.equal('${AnotherResource}');
+    });
+
+    it('should support ${self:key} syntax', () => {
+      expect(processedConfig.custom.selfReference).to.equal('bar');
+    });
+  });
 });