From c70e90cb48bee66d9f3bc3b688c8ada49f09d290 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.sundell87@gmail.com>
Date: Tue, 18 Dec 2018 16:19:49 +0100
Subject: [PATCH] rollback test state to before template variables were added

---
 .../specs/query_aggregation_ctrl.test.ts      | 57 ++-----------------
 1 file changed, 6 insertions(+), 51 deletions(-)

diff --git a/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts b/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
index 6e83824d504..81011f5dfe0 100644
--- a/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
+++ b/public/app/plugins/datasource/stackdriver/specs/query_aggregation_ctrl.test.ts
@@ -17,68 +17,27 @@ describe('StackdriverAggregationCtrl', () => {
             },
             {
               replace: s => s,
-              variables: [{ name: 'someVariable1' }, { name: 'someVariable2' }],
             }
           );
         });
 
         it('should populate all aggregate options except two', () => {
           ctrl.setAggOptions();
-          expect(ctrl.aggOptions.length).toBe(2);
-          const [templateVariableGroup, aggOptionsGroup] = ctrl.aggOptions;
-          expect(templateVariableGroup.options.length).toBe(2);
-          expect(aggOptionsGroup.options.length).toBe(11);
-          expect(aggOptionsGroup.options.map(o => o.value)).toEqual(
+          expect(ctrl.aggOptions.length).toBe(11);
+          expect(ctrl.aggOptions.map(o => o.value)).toEqual(
             expect['not'].arrayContaining(['REDUCE_COUNT_TRUE', 'REDUCE_COUNT_FALSE'])
           );
         });
 
         it('should populate all alignment options except two', () => {
           ctrl.setAlignOptions();
-          const [templateVariableGroup, alignOptionGroup] = ctrl.aggOptions;
-          expect(templateVariableGroup.options.length).toBe(2);
-          expect(alignOptionGroup.options.length).toBe(11);
-          expect(alignOptionGroup.options.map(o => o.value)).toEqual(
+          expect(ctrl.alignOptions.length).toBe(9);
+          expect(ctrl.alignOptions.map(o => o.value)).toEqual(
             expect['not'].arrayContaining(['REDUCE_COUNT_TRUE', 'REDUCE_COUNT_FALSE'])
           );
         });
       });
 
-      describe('and result is double and delta and no group by is used', () => {
-        beforeEach(async () => {
-          ctrl = new StackdriverAggregationCtrl(
-            {
-              $on: () => {},
-              target: {
-                valueType: 'DOUBLE',
-                metricKind: 'DELTA',
-                aggregation: { crossSeriesReducer: '', groupBys: [] },
-              },
-            },
-            {
-              replace: s => s,
-              variables: [{ name: 'someVariable1' }, { name: 'someVariable2' }],
-            }
-          );
-        });
-
-        it('should populate all alignment options except four', () => {
-          ctrl.setAlignOptions();
-          const [templateVariableGroup, alignOptionGroup] = ctrl.alignOptions;
-          expect(templateVariableGroup.options.length).toBe(2);
-          expect(alignOptionGroup.options.length).toBe(9);
-          expect(alignOptionGroup.options.map(o => o.value)).toEqual(
-            expect['not'].arrayContaining([
-              'ALIGN_NEXT_OLDER',
-              'ALIGN_INTERPOLATE',
-              'ALIGN_COUNT_TRUE',
-              'ALIGN_COUNT_FALSE',
-              'ALIGN_FRACTION_TRUE',
-            ])
-          );
-        });
-      });
-
       describe('and result is double and gauge and a group by is used', () => {
         beforeEach(async () => {
           ctrl = new StackdriverAggregationCtrl(
@@ -92,18 +51,14 @@ describe('StackdriverAggregationCtrl', () => {
             },
             {
               replace: s => s,
-              variables: [{ name: 'someVariable1' }],
             }
           );
         });
 
         it('should populate all aggregate options except three', () => {
           ctrl.setAggOptions();
-          const [templateVariableGroup, aggOptionsGroup] = ctrl.aggOptions;
-          expect(ctrl.aggOptions.length).toBe(2);
-          expect(templateVariableGroup.options.length).toBe(1);
-          expect(aggOptionsGroup.options.length).toBe(10);
-          expect(aggOptionsGroup.options.map(o => o.value)).toEqual(
+          expect(ctrl.aggOptions.length).toBe(10);
+          expect(ctrl.aggOptions.map(o => o.value)).toEqual(
             expect['not'].arrayContaining(['REDUCE_COUNT_TRUE', 'REDUCE_COUNT_FALSE', 'REDUCE_NONE'])
           );
         });