-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
related to issue #196, I created the formcontent in my repo, now there is a request to move the code into a pivotal repo to remove the dependency on a personal repo. [#159835480]
- Loading branch information
1 parent
251b64c
commit 7fcf10b
Showing
12 changed files
with
196 additions
and
222 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| package formcontent_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func TestFormcontent(t *testing.T) { | ||
| RegisterFailHandler(Fail) | ||
| RunSpecs(t, "Formcontent Suite") | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| package formcontent_test | ||
|
|
||
| import ( | ||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/pivotal-cf/om/formcontent" | ||
|
|
||
| "io/ioutil" | ||
| "os" | ||
| ) | ||
|
|
||
| var _ = Describe("Formcontent", func() { | ||
| var form *formcontent.Form | ||
|
|
||
| Describe("AddFile", func() { | ||
| var ( | ||
| fileWithContent1 string | ||
| fileWithContent2 string | ||
| ) | ||
|
|
||
| BeforeEach(func() { | ||
| handle1, err := ioutil.TempFile("", "") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| _, err = handle1.WriteString("some content") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| fileWithContent1 = handle1.Name() | ||
|
|
||
| handle2, err := ioutil.TempFile("", "") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| _, err = handle2.WriteString("some more content") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| fileWithContent2 = handle2.Name() | ||
|
|
||
| form = formcontent.NewForm() | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| os.Remove(fileWithContent1) | ||
| os.Remove(fileWithContent2) | ||
| }) | ||
|
|
||
| It("writes out the provided file as a multipart form using the writer", func() { | ||
| err := form.AddFile("something[file1]", fileWithContent1) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = form.AddFile("something[file2]", fileWithContent2) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| submission := form.Finalize() | ||
|
|
||
| content, err := ioutil.ReadAll(submission.Content) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| Expect(string(content)).To(MatchRegexp(`^--\w+\r\nContent-Disposition: form-data; name=\"something\[file1\]\"; filename=\"\w+\"\r\n` + | ||
| `Content-Type: application/octet-stream\r\n\r\n` + | ||
| `some content` + | ||
| `\r\n--\w+\r\nContent-Disposition: form-data; name=\"something\[file2\]\"; filename=\"\w+\"\r\n` + | ||
| `Content-Type: application/octet-stream\r\n\r\n` + | ||
| `some more content` + | ||
| `\r\n--\w+--\r\n$`)) | ||
| }) | ||
|
|
||
| Context("when the file provided is empty", func() { | ||
| It("returns an error", func() { | ||
| emptyFile, err := ioutil.TempFile("", "") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| form := formcontent.NewForm() | ||
|
|
||
| err = form.AddFile("foo", emptyFile.Name()) | ||
| Expect(err).To(MatchError("file provided has no content")) | ||
| }) | ||
| }) | ||
|
|
||
| Context("when an error occurs", func() { | ||
| Context("when the original file cannot be read", func() { | ||
| It("returns an error", func() { | ||
| form := formcontent.NewForm() | ||
|
|
||
| err := form.AddFile("foo", "/file/does/not/exist") | ||
| Expect(err).To(MatchError(ContainSubstring("no such file or directory"))) | ||
| }) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("AddField", func() { | ||
| BeforeEach(func() { | ||
| form = formcontent.NewForm() | ||
| }) | ||
|
|
||
| It("writes out the provided fields into the multipart form using the writer", func() { | ||
| err := form.AddField("key1", "value1") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = form.AddField("key2", "value2") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| submission := form.Finalize() | ||
|
|
||
| content, err := ioutil.ReadAll(submission.Content) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| Expect(string(content)).To(MatchRegexp(`^--\w+\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1` + | ||
| `\r\n--\w+\r\nContent-Disposition: form-data; name="key2"\r\n\r\nvalue2` + | ||
| `\r\n--\w+--\r\n$`)) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("AddCombined", func() { | ||
| var fileWithContent1 string | ||
|
|
||
| BeforeEach(func() { | ||
| var err error | ||
|
|
||
| handle1, err := ioutil.TempFile("", "") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| _, err = handle1.WriteString("some content") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| fileWithContent1 = handle1.Name() | ||
|
|
||
| form = formcontent.NewForm() | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| os.Remove(fileWithContent1) | ||
| }) | ||
|
|
||
| It("writes out the provided fields into the multipart form using the writer", func() { | ||
| err := form.AddField("key1", "value1") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| err = form.AddFile("file1", fileWithContent1) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| submission := form.Finalize() | ||
|
|
||
| content, err := ioutil.ReadAll(submission.Content) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| Expect(submission.ContentLength).To(Equal(int64(373))) | ||
| Expect(string(content)).To(MatchRegexp(`^--\w+\r\nContent-Disposition: form-data; name=\"file1\"; filename=\"\w+\"\r\n` + | ||
| `Content-Type: application/octet-stream\r\n\r\n` + | ||
| `some content` + | ||
| `\r\n--\w+\r\nContent-Disposition: form-data; name="key1"\r\n\r\nvalue1` + | ||
| `\r\n--\w+--\r\n$`)) | ||
| }) | ||
| }) | ||
|
|
||
| Describe("Finalize", func() { | ||
| var form *formcontent.Form | ||
|
|
||
| BeforeEach(func() { | ||
| form = formcontent.NewForm() | ||
| }) | ||
|
|
||
| It("returns a content submission which includes the correct length and content type", func() { | ||
| err := form.AddField("key1", "value1") | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| submission := form.Finalize() | ||
|
|
||
| Expect(submission.ContentLength).To(Equal(int64(185))) | ||
| Expect(submission.ContentType).To(ContainSubstring("multipart/form-data")) | ||
| }) | ||
|
|
||
| }) | ||
| }) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.