fix: location of charts to be tested

operator-framework · Jul 17, 2020 · 030fb29 · 030fb29
1 parent 06e7de5
commit 030fb29
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/pkg/helm/watches/watches_test.go b/pkg/helm/watches/watches_test.go
@@ -42,15 +42,15 @@ func TestLoadReader(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: value
 `,
 			expectWatches: []Watch{
 				{
 					GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-					ChartDir:                "../../../internal/scaffold/helm/testdata/testcharts/test-chart",
+					ChartDir:                "../../../internal/plugins/helm/v1/chartutil/testdata/test-chart",
 					WatchDependentResources: &falseVal,
 					OverrideValues:          map[string]string{"key": "value"},
 				},
@@ -63,7 +63,7 @@ func TestLoadReader(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: $MY_VALUE
@@ -72,7 +72,7 @@ func TestLoadReader(t *testing.T) {
 			expectWatches: []Watch{
 				{
 					GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-					ChartDir:                "../../../internal/scaffold/helm/testdata/testcharts/test-chart",
+					ChartDir:                "../../../internal/plugins/helm/v1/chartutil/testdata/test-chart",
 					WatchDependentResources: &falseVal,
 					OverrideValues:          map[string]string{"key": "value"},
 				},
@@ -85,21 +85,21 @@ func TestLoadReader(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyFirstKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 - group: mygroup
   version: v1alpha1
   kind: MySecondKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 `,
 			expectWatches: []Watch{
 				{
 					GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyFirstKind"},
-					ChartDir:                "../../../internal/scaffold/helm/testdata/testcharts/test-chart",
+					ChartDir:                "../../../internal/plugins/helm/v1/chartutil/testdata/test-chart",
 					WatchDependentResources: &trueVal,
 				},
 				{
 					GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MySecondKind"},
-					ChartDir:                "../../../internal/scaffold/helm/testdata/testcharts/test-chart",
+					ChartDir:                "../../../internal/plugins/helm/v1/chartutil/testdata/test-chart",
 					WatchDependentResources: &trueVal,
 				},
 			},
@@ -111,11 +111,11 @@ func TestLoadReader(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 `,
 			expectErr: true,
 		},
@@ -124,7 +124,7 @@ func TestLoadReader(t *testing.T) {
 			data: `---
 - group: mygroup
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 `,
 			expectErr: true,
 		},
@@ -133,7 +133,7 @@ func TestLoadReader(t *testing.T) {
 			data: `---
 - group: mygroup
   version: v1alpha1
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 `,
 			expectErr: true,
 		},
@@ -153,7 +153,7 @@ func TestLoadReader(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   overrideValues:
     key1:
 		key2: value
@@ -210,15 +210,15 @@ func TestLoad(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     key: value
 `,
 			expectWatches: []Watch{
 				{
 					GroupVersionKind:        schema.GroupVersionKind{Group: "mygroup", Version: "v1alpha1", Kind: "MyKind"},
-					ChartDir:                "../../../internal/scaffold/helm/testdata/testcharts/test-chart",
+					ChartDir:                "../../../internal/plugins/helm/v1/chartutil/testdata/test-chart",
 					WatchDependentResources: &falseVal,
 					OverrideValues:          map[string]string{"key": "value"},
 				},
@@ -312,7 +312,7 @@ func TestAppend(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     "key": "value"
@@ -330,7 +330,7 @@ func TestAppend(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     "key": "value"
@@ -349,7 +349,7 @@ func TestAppend(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     "key": "value"
@@ -368,7 +368,7 @@ func TestAppend(t *testing.T) {
 group: mygroup
 version: v1alpha1
 kind: MyKind
-chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
 watchDependentResources: false
 overrideValues:
   "key": "value"
@@ -443,7 +443,7 @@ func TestUpdateForResource(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     "key": "value"
@@ -453,7 +453,7 @@ func TestUpdateForResource(t *testing.T) {
 - group: mygroup
   version: v1alpha1
   kind: MyKind
-  chart: ../../../internal/scaffold/helm/testdata/testcharts/test-chart
+  chart: ../../../internal/plugins/helm/v1/chartutil/testdata/test-chart
   watchDependentResources: false
   overrideValues:
     "key": "value"