atcoder
diff --git a/‎samples/upload/README.md
Copy file name to clipboardExpand all lines: samples/upload/README.md
-75Lines changed: 0 additions & 75 deletions b/‎samples/upload/README.md
Copy file name to clipboardExpand all lines: samples/upload/README.md
-75Lines changed: 0 additions & 75 deletions
diff --git a/‎samples/upload/app/controllers/single.go
Copy file name to clipboardExpand all lines: samples/upload/app/controllers/single.go
+3-3Lines changed: 3 additions & 3 deletions b/‎samples/upload/app/controllers/single.go
Copy file name to clipboardExpand all lines: samples/upload/app/controllers/single.go
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎samples/upload/tests/apptest.go
Copy file name to clipboardExpand all lines: samples/upload/tests/apptest.go
-21Lines changed: 0 additions & 21 deletions b/‎samples/upload/tests/apptest.go
Copy file name to clipboardExpand all lines: samples/upload/tests/apptest.go
-21Lines changed: 0 additions & 21 deletions
diff --git a/‎samples/upload/tests/multipletest.go
Copy file name to clipboard
+38Lines changed: 38 additions & 0 deletions b/‎samples/upload/tests/multipletest.go
Copy file name to clipboard
+38Lines changed: 38 additions & 0 deletions
diff --git a/‎samples/upload/tests/singletest.go
Copy file name to clipboard
+44Lines changed: 44 additions & 0 deletions b/‎samples/upload/tests/singletest.go
Copy file name to clipboard
+44Lines changed: 44 additions & 0 deletions
@@ -37,13 +37,13 @@ func (c *Single) HandleUpload(avatar []byte) revel.Result {
 
 	// Check format of the file.
 	conf, format, err := image.DecodeConfig(bytes.NewReader(avatar))
-	c.Validation.Required(err == nil).
+	c.Validation.Required(err == nil).Key("avatar").
 		Message("Incorrect file format")
-	c.Validation.Required(format == "jpeg" || format == "png").
+	c.Validation.Required(format == "jpeg" || format == "png").Key("avatar").
 		Message("JPEG or PNG file format is expected")
 
 	// Check resolution.
-	c.Validation.Required(conf.Height >= 150 && conf.Width >= 150).
+	c.Validation.Required(conf.Height >= 150 && conf.Width >= 150).Key("avatar").
 		Message("Minimum allowed resolution is 150x150px")
 
 	// Handle errors.
 
@@ -0,0 +1,38 @@
+package tests
+
+import (
+	"net/url"
+
+	"github.com/revel/revel/samples/upload/app/routes"
+
+	"github.com/revel/revel"
+)
+
+type MultipleTest struct {
+	revel.TestSuite
+}
+
+func (t *MultipleTest) TestThatMultipleFilesUploadWorks() {
+	// Make sure it is not allowed to submit less than 2 files.
+	t.PostFile(routes.Multiple.HandleUpload(), url.Values{}, url.Values{
+		"file": {
+			"github.com/revel/revel/samples/upload/public/img/favicon.png",
+		},
+	})
+	t.AssertOk()
+	t.AssertContains("You cannot submit less than 2 files")
+
+	// Make sure upload of 2 files works.
+	t.PostFile(routes.Multiple.HandleUpload(), url.Values{}, url.Values{
+		"file[]": {
+			"github.com/revel/revel/samples/upload/public/img/favicon.png",
+			"github.com/revel/revel/samples/upload/public/img/glyphicons-halflings.png",
+		},
+	})
+	revel.WARN.Println(string(t.ResponseBody))
+	t.AssertOk()
+	t.AssertContains("Successfully uploaded")
+	t.AssertContains("favicon.png")
+	t.AssertContains("glyphicons-halflings.png")
+	t.AssertContains("image/png")
+}
@@ -0,0 +1,44 @@
+package tests
+
+import (
+	"net/url"
+
+	"github.com/revel/revel"
+)
+
+type SingleTest struct {
+	revel.TestSuite
+}
+
+func (t *SingleTest) TestThatSingleAvatarUploadWorks() {
+	// Make sure file is required.
+	t.PostFile("/single/HandleUpload", url.Values{}, url.Values{
+		"avatar": {},
+	})
+	t.AssertOk()
+	t.AssertContains("Upload demo")
+	t.AssertContains("Required")
+
+	// Make sure incorrect format is not being accepted.
+	t.PostFile("/single/HandleUpload", url.Values{}, url.Values{
+		"avatar": {"github.com/revel/revel/samples/upload/public/css/bootstrap.css"},
+	})
+	t.AssertOk()
+	t.AssertContains("Incorrect file format")
+
+	// Ensure low resolution avatar cannot be uploaded.
+	t.PostFile("/single/HandleUpload", url.Values{}, url.Values{
+		"avatar": {"github.com/revel/revel/samples/upload/public/img/favicon.png"},
+	})
+	t.AssertOk()
+	t.AssertContains("Minimum allowed resolution is 150x150px")
+
+	// Check whether correct avatar is uploaded.
+	t.PostFile("/single/HandleUpload", url.Values{}, url.Values{
+		"avatar": {"github.com/revel/revel/samples/upload/public/img/glyphicons-halflings.png"},
+	})
+	t.AssertOk()
+	t.AssertContains("image/png")
+	t.AssertContains("glyphicons-halflings.png")
+	t.AssertContains("Successfully uploaded")
+}