Merge pull request #13 from gobuffalo/github-actions

actions

Author: markbates

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: markbates
+patreon: buffalo

.github/workflows/tests.yml

@@ -0,0 +1,22 @@
+name: Tests
+on: [push]
+jobs:
+
+  tests-on:
+    name: ${{matrix.go-version}} ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        go-version: [1.12.x, 1.13.x]
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    steps:
+    - name: Checkout Code
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Test
+      run: |
+        go mod tidy -v
+        go test -race ./...
+
+

Makefile

@@ -1,61 +1,2 @@
-TAGS ?= ""
-GO_BIN ?= "go"
-
-install: 
-	$(GO_BIN) install -tags ${TAGS} -v .
-	make tidy
-
-tidy:
-ifeq ($(GO111MODULE),on)
-	$(GO_BIN) mod tidy
-else
-	echo skipping go mod tidy
-endif
-
-deps:
-	$(GO_BIN) get -tags ${TAGS} -t ./...
-	make tidy
-
-build: 
-	$(GO_BIN) build -v .
-	make tidy
-
-test: 
-	$(GO_BIN) test -cover -tags ${TAGS} ./...
-	make tidy
-
-ci-deps: 
-	$(GO_BIN) get -tags ${TAGS} -t ./...
-
-ci-test: 
-	$(GO_BIN) test -tags ${TAGS} -race ./...
-
-lint:
-	go get github.com/golangci/golangci-lint/cmd/golangci-lint
-	golangci-lint run --enable-all
-	make tidy
-
-update:
-ifeq ($(GO111MODULE),on)
-	rm go.*
-	$(GO_BIN) mod init
-	$(GO_BIN) mod tidy
-else
-	$(GO_BIN) get -u -tags ${TAGS}
-endif
-	make test
-	make install
-	make tidy
-
-release-test: 
-	$(GO_BIN) test -tags ${TAGS} -race ./...
-	make tidy
-
-release:
-	$(GO_BIN) get github.com/gobuffalo/release
-	make tidy
-	release -y -f version.go --skip-packr
-	make tidy
-
-
-
+test:
+	go test -cover ./...

go.mod

@@ -1,9 +1,8 @@
 module github.com/gobuffalo/httptest
 
-go 1.12
+go 1.13
 
 require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/gorilla/sessions v1.1.3
-	github.com/stretchr/testify v1.3.0
+	github.com/gorilla/sessions v1.2.0
+	github.com/stretchr/testify v1.4.0
 )

go.sum

@@ -1,15 +1,15 @@
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8=
-github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.1.3 h1:uXoZdcdA5XdXF3QzuSlheVRUvjl+1rKY7zBXL68L9RU=
-github.com/gorilla/sessions v1.1.3/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
+github.com/gorilla/sessions v1.2.0 h1:S7P+1Hm5V/AT9cjEcUD5uDaQSX0OE577aCXgoaKpYbQ=
+github.com/gorilla/sessions v1.2.0/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

request.go

@@ -62,7 +62,8 @@ func (r *Request) perform(req *http.Request) *Response {
 	req.RequestURI = r.URL
 	req.Header.Set("Cookie", r.handler.Cookies)
 	r.handler.ServeHTTP(res, req)
-	c := res.Result().Header.Get("Set-Cookie")
+
+	c := res.Header().Get("Set-Cookie")
 	r.handler.Cookies = c
 	return res
 }

version.go

@@ -1,3 +1,3 @@
 package httptest
 
-const Version = "v1.4.0"
+const Version = ""