Clean all the e2e tests using now appropriate description, domains and name/email.

silvin-lubecki · silvin-lubecki · commit 4822d4f24503 · 2019-03-25T12:06:08.000+01:00
Signed-off-by: Silvin Lubecki &lt;silvin.lubecki@docker.com&gt;
diff --git a/e2e/commands_test.go b/e2e/commands_test.go
@@ -109,10 +109,10 @@ name: app-test
 description: my cool app
 # List of application maintainers with name and email for each
 maintainers:
-  - name: bob
+  - name: dev1
     email: 
-  - name: joe
-    email: joe@joe.com
+  - name: dev2
+    email: dev2@example.com
 `
 	envData := "# some comment\nNGINX_DRY_RUN=-t"
 	tmpDir := fs.NewDir(t, "app_input",
@@ -129,8 +129,8 @@ maintainers:
 		"init", testAppName,
 		"--compose-file", tmpDir.Join(internal.ComposeFileName),
 		"--description", "my cool app",
-		"--maintainer", "bob",
-		"--maintainer", "joe:joe@joe.com")
+		"--maintainer", "dev1",
+		"--maintainer", "dev2:dev2@example.com")
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
 	manifest := fs.Expected(
@@ -148,23 +148,23 @@ maintainers:
 
 	// test single-file init
 	cmd.Command = dockerCli.Command("app",
-		"init", "tac",
+		"init", "myapp",
 		"--compose-file", tmpDir.Join(internal.ComposeFileName),
-		"--description", "my cool app",
-		"--maintainer", "bob",
-		"--maintainer", "joe:joe@joe.com",
+		"--description", "some description",
+		"--maintainer", "dev1",
+		"--maintainer", "dev2:dev2@example.com",
 		"--single-file",
 	)
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
-	appData, err := ioutil.ReadFile(tmpDir.Join("tac.dockerapp"))
+	appData, err := ioutil.ReadFile(tmpDir.Join("myapp.dockerapp"))
 	assert.NilError(t, err)
 	golden.Assert(t, string(appData), "init-singlefile.dockerapp")
 	// Check various commands work on single-file app package
-	cmd.Command = dockerCli.Command("app", "inspect", "tac")
+	cmd.Command = dockerCli.Command("app", "inspect", "myapp")
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 
-	cmd.Command = dockerCli.Command("app", "render", "tac")
+	cmd.Command = dockerCli.Command("app", "render", "myapp")
 	icmd.RunCmd(cmd).Assert(t, icmd.Success)
 }
 
diff --git a/e2e/testdata/attachments.dockerapp/metadata.yml b/e2e/testdata/attachments.dockerapp/metadata.yml
@@ -1,8 +1,7 @@
 version: 0.1.0
 name: myapp
-description: ""
 maintainers:
-  - name: bearclaw
-    email: bearclaw@bearclaw.com
-  - name: bob
-    email: bob@bob.com
+  - name: dev1
+    email: dev1@example.com
+  - name: dev2
+    email: dev2@example.com
diff --git a/e2e/testdata/attachments.dockerapp/parameters.yml b/e2e/testdata/attachments.dockerapp/parameters.yml
@@ -8,5 +8,5 @@ tty: true
 aport: 10000
 sport: 11000
 dport: 12000
-memory: "100000000"
+memory: 1024M
 timeout: 10s
diff --git a/e2e/testdata/envvariables-inspect.golden b/e2e/testdata/envvariables-inspect.golden
@@ -1,6 +1,6 @@
 myapp 0.1.0
 
-Maintained by: bearclaw <bearclaw@bearclaw.bearclaw>
+Maintained by: dev <dev@example.com>
 
 Service (1) Replicas Ports Image
 ----------- -------- ----- -----
diff --git a/e2e/testdata/expected-json-render.golden b/e2e/testdata/expected-json-render.golden
@@ -22,8 +22,8 @@
         "back": null,
         "front": {
           "aliases": [
-            "corp.app.api.com",
-            "coolapp.com"
+            "api.example.com",
+            "example.com"
           ]
         }
       }
diff --git a/e2e/testdata/expected-yaml-render.golden b/e2e/testdata/expected-yaml-render.golden
@@ -6,8 +6,8 @@ services:
       back: null
       front:
         aliases:
-        - corp.app.api.com
-        - coolapp.com
+        - api.example.com
+        - example.com
   db:
     image: postgres:9.3
     networks:
diff --git a/e2e/testdata/image-inspect-labels.golden b/e2e/testdata/image-inspect-labels.golden
diff --git a/e2e/testdata/init-singlefile.dockerapp b/e2e/testdata/init-singlefile.dockerapp
@@ -2,15 +2,15 @@
 # Version of the application
 version: 0.1.0
 # Name of the application
-name: tac
+name: myapp
 # A short description of the application
-description: my cool app
+description: some description
 # List of application maintainers with name and email for each
 maintainers:
-  - name: bob
+  - name: dev1
     email: 
-  - name: joe
-    email: joe@joe.com
+  - name: dev2
+    email: dev2@example.com
 
 ---
 # This section contains the Compose file that describes your application services.
diff --git a/e2e/testdata/push-pull/push-pull.dockerapp/metadata.yml b/e2e/testdata/push-pull/push-pull.dockerapp/metadata.yml
@@ -3,6 +3,6 @@ name: push-pull
 description: "new fancy webapp with microservices"
 maintainers:
   - name: John Developer
-    email: john.dev@acmecorp.cool
+    email: john.dev@example.com
   - name: Jane Developer
-    email: jane.dev@acmecorp.cool
+    email: jane.dev@example.com
diff --git a/e2e/testdata/push-pull/push-pull.dockerapp/parameters.yml b/e2e/testdata/push-pull/push-pull.dockerapp/parameters.yml
@@ -1,3 +0,0 @@
-web_port: '8082'
-api_host: coolapp.com
-static_subdir: data/static
diff --git a/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml b/e2e/testdata/render/envvariables/my.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 0.1.0
 name: myapp
-description: ""
 maintainers:
-  - name: bearclaw
-    email: bearclaw@bearclaw.bearclaw
+  - name: dev
+    email: dev@example.com
diff --git a/e2e/testdata/simple-bundle.json.golden b/e2e/testdata/simple-bundle.json.golden
@@ -5,11 +5,11 @@
 	"maintainers": [
 		{
 			"name": "John Developer",
-			"email": "john.dev@acmecorp.cool"
+			"email": "john.dev@example.com"
 		},
 		{
 			"name": "Jane Developer",
-			"email": "jane.dev@acmecorp.cool"
+			"email": "jane.dev@example.com"
 		}
 	],
 	"invocationImages": [
@@ -47,7 +47,7 @@
 	"parameters": {
 		"api_host": {
 			"type": "string",
-			"defaultValue": "coolapp.com",
+			"defaultValue": "example.com",
 			"destination": {
 				"env": "docker_param1"
 			}
diff --git a/e2e/testdata/simple/simple.dockerapp/docker-compose.yml b/e2e/testdata/simple/simple.dockerapp/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       back:
       front:
         aliases:
-          - corp.app.api.com
+          - api.example.com
           - ${api_host}
   web:
     image: nginx:latest
diff --git a/e2e/testdata/simple/simple.dockerapp/metadata.yml b/e2e/testdata/simple/simple.dockerapp/metadata.yml
@@ -3,6 +3,6 @@ name: simple
 description: "new fancy webapp with microservices"
 maintainers:
   - name: John Developer
-    email: john.dev@acmecorp.cool
+    email: john.dev@example.com
   - name: Jane Developer
-    email: jane.dev@acmecorp.cool
+    email: jane.dev@example.com
diff --git a/e2e/testdata/simple/simple.dockerapp/parameters.yml b/e2e/testdata/simple/simple.dockerapp/parameters.yml
@@ -1,3 +1,3 @@
 web_port: '8082'
-api_host: coolapp.com
+api_host: example.com
 static_subdir: data/static
diff --git a/e2e/testdata/templates/gotemplate/my.dockerapp/metadata.yml b/e2e/testdata/templates/gotemplate/my.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 0.1.0
 name: myapp
-description: ""
 maintainers:
-  - name: bearclaw
-    email: bearclaw@bearclaw.bearclaw
+  - name: dev
+    email: dev@example.com
diff --git a/e2e/testdata/templates/mustache/my.dockerapp/metadata.yml b/e2e/testdata/templates/mustache/my.dockerapp/metadata.yml
@@ -1,6 +1,5 @@
 version: 0.1.0
 name: myapp
-description: ""
 maintainers:
-  - name: bearclaw
-    email: bearclaw@bearclaw.bearclaw
+  - name: dev
+    email: dev@example.com
diff --git a/internal/inspect/inspect_test.go b/internal/inspect/inspect_test.go
@@ -22,28 +22,28 @@ func TestInspect(t *testing.T) {
 			fs.WithFile(internal.ComposeFileName, composeYAML),
 			fs.WithFile(internal.MetadataFileName, `
 version: 0.1.0
-name: foo`),
+name: myapp`),
 			fs.WithFile(internal.ParametersFileName, ``),
 		),
 		fs.WithDir("no-description",
 			fs.WithFile(internal.ComposeFileName, composeYAML),
 			fs.WithFile(internal.MetadataFileName, `
 version: 0.1.0
-name: foo
+name: myapp
 maintainers:
-  - name: foo
-    email: "foo@bar.com"`),
+  - name: dev
+    email: "dev@example.com"`),
 			fs.WithFile(internal.ParametersFileName, ""),
 		),
 		fs.WithDir("no-parameters",
 			fs.WithFile(internal.ComposeFileName, composeYAML),
 			fs.WithFile(internal.MetadataFileName, `
 version: 0.1.0
-name: foo
+name: myapp
 maintainers:
-  - name: foo
-    email: "foo@bar.com"
-description: "this is sparta !"`),
+  - name: dev
+    email: "dev@example.com"
+description: "some description"`),
 			fs.WithFile(internal.ParametersFileName, ""),
 		),
 		fs.WithDir("overridden",
@@ -58,7 +58,7 @@ services:
 `),
 			fs.WithFile(internal.MetadataFileName, `
 version: 0.1.0
-name: foo
+name: myapp
 `),
 			fs.WithFile(internal.ParametersFileName, ""),
 		),
@@ -83,11 +83,11 @@ secrets:
 `),
 			fs.WithFile(internal.MetadataFileName, `
 version: 0.1.0
-name: foo
+name: myapp
 maintainers:
-  - name: foo
-    email: "foo@bar.com"
-description: "this is sparta !"`),
+  - name: dev
+    email: "dev@example.com"
+description: "some description"`),
 			fs.WithFile(internal.ParametersFileName, `
 port: 8080
 text: hello`),
diff --git a/internal/inspect/testdata/inspect-full.golden b/internal/inspect/testdata/inspect-full.golden
@@ -1,8 +1,8 @@
-foo 0.1.0
+myapp 0.1.0
 
-Maintained by: foo <foo@bar.com>
+Maintained by: dev <dev@example.com>
 
-this is sparta !
+some description
 
 Service (1) Replicas Ports     Image
 ----------- -------- -----     -----
diff --git a/internal/inspect/testdata/inspect-no-description.golden b/internal/inspect/testdata/inspect-no-description.golden
@@ -1,3 +1,3 @@
-foo 0.1.0
+myapp 0.1.0
 
-Maintained by: foo <foo@bar.com>
+Maintained by: dev <dev@example.com>
diff --git a/internal/inspect/testdata/inspect-no-maintainers.golden b/internal/inspect/testdata/inspect-no-maintainers.golden
@@ -1 +1 @@
-foo 0.1.0
+myapp 0.1.0
diff --git a/internal/inspect/testdata/inspect-no-parameters.golden b/internal/inspect/testdata/inspect-no-parameters.golden
@@ -1,5 +1,5 @@
-foo 0.1.0
+myapp 0.1.0
 
-Maintained by: foo <foo@bar.com>
+Maintained by: dev <dev@example.com>
 
-this is sparta !
+some description
diff --git a/internal/inspect/testdata/inspect-overridden.golden b/internal/inspect/testdata/inspect-overridden.golden
@@ -1,4 +1,4 @@
-foo 0.1.0
+myapp 0.1.0
 
 Service (1) Replicas Ports Image
 ----------- -------- ----- -----
diff --git a/internal/packager/init_test.go b/internal/packager/init_test.go
@@ -139,7 +139,7 @@ func TestWriteMetadataFile(t *testing.T) {
 	tmpdir := fs.NewDir(t, appName)
 	defer tmpdir.Remove()
 
-	err := writeMetadataFile(appName, tmpdir.Path(), "", []string{"bearclaw:bearclaw"})
+	err := writeMetadataFile(appName, tmpdir.Path(), "", []string{"dev:dev@example.com"})
 	assert.NilError(t, err)
 
 	data := `# Version of the application
@@ -150,8 +150,8 @@ name: writemetadata_test
 description: 
 # List of application maintainers with name and email for each
 maintainers:
-  - name: bearclaw
-    email: bearclaw
+  - name: dev
+    email: dev@example.com
 `
 
 	manifest := fs.Expected(t,
diff --git a/internal/packager/testdata/bundle-json.golden b/internal/packager/testdata/bundle-json.golden
@@ -4,12 +4,12 @@
   "description": "hello",
   "maintainers": [
     {
-      "name": "bearclaw",
-      "email": "bearclaw@bearclaw.com"
+      "name": "dev1",
+      "email": "dev1@example.com"
     },
     {
-      "name": "bob",
-      "email": "bob@bob.com"
+      "name": "dev2",
+      "email": "dev2@example.com"
     }
   ],
   "invocationImages": [
diff --git a/internal/packager/testdata/packages/packing.dockerapp/metadata.yml b/internal/packager/testdata/packages/packing.dockerapp/metadata.yml
@@ -2,7 +2,7 @@ version: 0.1.0
 name: packing
 description: "hello"
 maintainers:
-  - name: bearclaw
-    email: bearclaw@bearclaw.com
-  - name: bob
-    email: bob@bob.com
+  - name: dev1
+    email: dev1@example.com
+  - name: dev2
+    email: dev2@example.com
diff --git a/types/metadata/load_test.go b/types/metadata/load_test.go
@@ -20,8 +20,8 @@ func TestAllFields(t *testing.T) {
 		Description: "something about this application",
 		Maintainers: []Maintainer{
 			{
-				Name:  "bob",
-				Email: "bob@aol.com",
+				Name:  "dev",
+				Email: "dev@example.com",
 			},
 		},
 	}
diff --git a/types/metadata/metadata_test.go b/types/metadata/metadata_test.go
@@ -8,17 +8,17 @@ import (
 )
 
 func TestMaintainer(t *testing.T) {
-	assert.Check(t, is.Equal(Maintainer{Name: "foo", Email: "foo@bar.com"}.String(), "foo <foo@bar.com>"))
-	assert.Check(t, is.Equal(Maintainer{Name: "foo", Email: ""}.String(), "foo"))
+	assert.Check(t, is.Equal(Maintainer{Name: "dev", Email: "dev@example.com"}.String(), "dev <dev@example.com>"))
+	assert.Check(t, is.Equal(Maintainer{Name: "dev", Email: ""}.String(), "dev"))
 	// FIXME(vdemeester) should we validate the mail ?
-	assert.Check(t, is.Equal(Maintainer{Name: "foo", Email: "bar"}.String(), "foo <bar>"))
+	assert.Check(t, is.Equal(Maintainer{Name: "dev", Email: "mail"}.String(), "dev <mail>"))
 	assert.Check(t, is.Equal(Maintainer{Name: "", Email: ""}.String(), ""))
 }
 
 func TestMaintainers(t *testing.T) {
-	m1 := Maintainer{Name: "foo", Email: "foo@bar.com"}
-	m2 := Maintainer{Name: "bar", Email: "bar@baz.com"}
+	m1 := Maintainer{Name: "dev1", Email: "dev1@example.com"}
+	m2 := Maintainer{Name: "dev2", Email: "dev2@example.com"}
 	assert.Check(t, is.Equal(Maintainers([]Maintainer{}).String(), ""))
-	assert.Check(t, is.Equal(Maintainers([]Maintainer{m1}).String(), "foo <foo@bar.com>"))
-	assert.Check(t, is.Equal(Maintainers([]Maintainer{m1, m2}).String(), "foo <foo@bar.com>, bar <bar@baz.com>"))
+	assert.Check(t, is.Equal(Maintainers([]Maintainer{m1}).String(), "dev1 <dev1@example.com>"))
+	assert.Check(t, is.Equal(Maintainers([]Maintainer{m1, m2}).String(), "dev1 <dev1@example.com>, dev2 <dev2@example.com>"))
 }

-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 myapp 0.1.0
 -Maintained by: bearclaw <[email protected]>
 +Maintained by: dev <[email protected]>
 Service (1) Replicas Ports Image
 ----------- -------- ----- -----
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@`
`22`	`22`	`"back": null,`
`23`	`23`	`"front": {`
`24`	`24`	`"aliases": [`
`25`		`- "corp.app.api.com",`
`26`		`- "coolapp.com"`
	`25`	`+ "api.example.com",`
	`26`	`+ "example.com"`
`27`	`27`	`]`
`28`	`28`	`}`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +0,0 @@`
`1`		`-web_port: '8082'`
`2`		`-api_host: coolapp.com`
`3`		`-static_subdir: data/static`