From cf81141689941374b5874e462050eea90e87e330 Mon Sep 17 00:00:00 2001
From: Lorenzo Affetti <lorenzo.affetti@gmail.com>
Date: Mon, 25 Feb 2019 12:38:04 +0100
Subject: [PATCH] fix(e2e-tests): make task use default bucket from user
 fixture (#12139)

* fix(e2e-tests): make task use default bucket from user fixture

* fix(query_test): update pre-auth test now that from is bucket aware
---
 query/preauthorizer_test.go    | 8 +++++---
 ui/cypress/e2e/tasks.test.ts   | 2 +-
 ui/cypress/support/commands.ts | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/query/preauthorizer_test.go b/query/preauthorizer_test.go
index 8335b9ef13..6a26cd6e0c 100644
--- a/query/preauthorizer_test.go
+++ b/query/preauthorizer_test.go
@@ -124,14 +124,16 @@ func TestPreAuthorizer_RequiredPermissions(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	pRead, err := platform.NewPermissionAtID(bFrom.ID, platform.ReadAction, platform.BucketsResourceType, o.ID)
+	if err != nil {
+		t.Fatal(err)
+	}
 	pWrite, err := platform.NewPermissionAtID(bTo.ID, platform.WriteAction, platform.BucketsResourceType, o.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	t.Log("WARNING: this test does not validate permissions on the 'from' bucket. Please update after https://github.com/influxdata/flux/issues/114.")
-
-	exp := []platform.Permission{*pWrite}
+	exp := []platform.Permission{*pRead, *pWrite}
 	if diff := cmp.Diff(exp, perms); diff != "" {
 		t.Fatalf("unexpected permissions: %s", diff)
 	}
diff --git a/ui/cypress/e2e/tasks.test.ts b/ui/cypress/e2e/tasks.test.ts
index 8deb53b1c3..ab5724348e 100644
--- a/ui/cypress/e2e/tasks.test.ts
+++ b/ui/cypress/e2e/tasks.test.ts
@@ -24,7 +24,7 @@ describe('Tasks', () => {
 
     cy.getByDataTest('flux-editor').within(() => {
       cy.get('textarea').type(
-        `from(bucket: "default")
+        `from(bucket: "defbuck")
       |> range(start: -2m)`,
         {force: true}
       )
diff --git a/ui/cypress/support/commands.ts b/ui/cypress/support/commands.ts
index 477e409fab..6e9296fe98 100644
--- a/ui/cypress/support/commands.ts
+++ b/ui/cypress/support/commands.ts
@@ -51,7 +51,7 @@ export const createTask = (
     every: 1d,
     offset: 20m
   }
-  from(bucket: "default")
+  from(bucket: "defbuck")
         |> range(start: -2m)`
 
   return cy.request({