From 6ba5550f5f3115aa0cf23e958dd460677b81dc90 Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 11 Sep 2018 14:09:08 +0200
Subject: [PATCH] renames jest files to match new convention

---
 ...{datasource.jest.ts => datasource.test.ts} | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)
 rename public/app/plugins/datasource/grafana/specs/{datasource.jest.ts => datasource.test.ts} (72%)

diff --git a/public/app/plugins/datasource/grafana/specs/datasource.jest.ts b/public/app/plugins/datasource/grafana/specs/datasource.test.ts
similarity index 72%
rename from public/app/plugins/datasource/grafana/specs/datasource.jest.ts
rename to public/app/plugins/datasource/grafana/specs/datasource.test.ts
index 544b04056ac..b3afe7207f2 100644
--- a/public/app/plugins/datasource/grafana/specs/datasource.jest.ts
+++ b/public/app/plugins/datasource/grafana/specs/datasource.test.ts
@@ -13,7 +13,11 @@ describe('grafana data source', () => {
     };
 
     const templateSrvStub = {
-      replace: val => val.replace('$var', 'replaced')
+      replace: val => {
+        return val
+        .replace('$var2', 'replaced|replaced2')
+        .replace('$var', 'replaced');
+      }
     };
 
     const ds = new GrafanaDatasource(backendSrvStub, q, templateSrvStub);
@@ -32,6 +36,21 @@ describe('grafana data source', () => {
       });
     });
 
+    describe('with tags that have multi value template variables', () => {
+      const options = setupAnnotationQueryOptions(
+        {tags: ['$var2']}
+      );
+
+      beforeEach(() => {
+        return ds.annotationQuery(options);
+      });
+
+      it('should interpolate template variables in tags in query options', () => {
+        expect(calledBackendSrvParams.tags[0]).toBe('replaced');
+        expect(calledBackendSrvParams.tags[1]).toBe('replaced2');
+      });
+    });
+
     describe('with type dashboard', () => {
       const options = setupAnnotationQueryOptions(
         {