Merge branch 'develop' of github.com:revel/revel into template-engine

notzippy · notzippy · commit 04ed4de71f11 · 2017-03-18T21:33:54.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -4,6 +4,8 @@ go:
   - 1.4
   - 1.5
   - 1.6
+  - 1.7
+  - 1.8
   - tip
 
 os:
@@ -24,9 +26,13 @@ services:
 
 before_install:
   # TRAVIS_OS_NAME - linux and osx
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install memcached redis; fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup /usr/local/opt/memcached/bin/memcached & fi'
-  - 'if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then nohup redis-server /usr/local/etc/redis.conf & fi'
+  - echo $TRAVIS_OS_NAME
+  - |
+    if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+      brew update && brew install memcached redis && brew services start redis && brew services start memcached
+    fi
+  - redis-server --daemonize yes
+  - redis-cli info
 
 install:
   # Setting environments variables
@@ -38,7 +44,7 @@ install:
   - git clone -b $REVEL_BRANCH git://github.com/revel/cmd ../cmd/
   - git clone -b $REVEL_BRANCH git://github.com/revel/config ../config/
   - git clone -b $REVEL_BRANCH git://github.com/revel/cron ../cron/
-  - git clone -b $REVEL_BRANCH git://github.com/revel/samples ../samples/
+  - git clone -b $REVEL_BRANCH git://github.com/revel/examples ../examples/
   - go get -v github.com/revel/revel/...
   - go get -v github.com/revel/cmd/revel
 
@@ -55,18 +61,10 @@ script:
   - revel package my/testapp
   - revel package my/testapp prod
 
-  # Build & run the sample apps
-  - revel test github.com/revel/samples/booking
-  - revel test github.com/revel/samples/chat
-  - revel test github.com/revel/samples/facebook-oauth2
-  - revel test github.com/revel/samples/twitter-oauth
-  - revel test github.com/revel/samples/validation
-  - revel test github.com/revel/samples/upload
-
   # Commented out persona test sample, since persona.org gonna be shutdown.
   # Also http://personatestuser.org becomes non-responsive most of the time.
   # https://wiki.mozilla.org/Identity/Persona_Shutdown_Guidelines_for_Reliers
-  # - revel test github.com/revel/samples/persona
+  # - revel test github.com/revel/examples/persona
 
 matrix:
   allow_failures:
diff --git a/errors.go b/errors.go
@@ -36,7 +36,7 @@ type SourceLine struct {
 func NewErrorFromPanic(err interface{}) *Error {
 
 	// Parse the filename and line from the originating line of app code.
-	// /Users/robfig/code/gocode/src/revel/samples/booking/app/controllers/hotels.go:191 (0x44735)
+	// /Users/robfig/code/gocode/src/revel/examples/booking/app/controllers/hotels.go:191 (0x44735)
 	stack := string(debug.Stack())
 	frame, basePath := findRelevantStackFrame(stack)
 	if frame == -1 {
diff --git a/testing/testsuite_test.go b/testing/testsuite_test.go
@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {
 
 	testSuite.AssertOk()
 	testSuite.AssertContentType("application/json")
-	testSuite.AssertHeader("Server", "nginx")
+	testSuite.AssertHeader("Server", "gunicorn/19.7.0")
 	testSuite.AssertContains("httpbin.org")
 	testSuite.AssertContainsRegex("gzip|deflate")
 }

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ func TestGetCustom(t *testing.T) {`
`76`	`76`
`77`	`77`	`testSuite.AssertOk()`
`78`	`78`	`testSuite.AssertContentType("application/json")`
`79`		`- testSuite.AssertHeader("Server", "nginx")`
	`79`	`+ testSuite.AssertHeader("Server", "gunicorn/19.7.0")`
`80`	`80`	`testSuite.AssertContains("httpbin.org")`
`81`	`81`	`testSuite.AssertContainsRegex("gzip\|deflate")`
`82`	`82`	`}`