...

.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
 
 env:
-  - TEST_CXX=1 TEST_NODE=1
-  - TEST_CXX=1 SUDO=1
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.8.7 TEST_CLASSIC_RAILS=0 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_RUBY=1 TEST_RUBY_VERSION=1.9.3 TEST_CLASSIC_RAILS=0
   - TEST_NGINX=1 TEST_STANDALONE=1 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_APACHE2=1 TEST_RUBYGEMS_VERSION=1.8.25
-  - TEST_SOURCE_PACKAGING=1 TEST_DEBIAN_PACKAGING=1 TEST_RUBYGEMS_VERSION=1.8.25
 
 script: ./dev/run_travis.sh

build/test_basics.rb

@@ -77,6 +77,7 @@
                 end
 	end
 	if boolean_option('NODE_MODULES', default)
-		sh "npm install mocha should sinon express"
+		sh "npm install mocha should sinon"
+		sh "npm install express@3.4.8"
 	end
 end

dev/run_travis.sh

@@ -83,8 +83,8 @@ function install_node_and_modules()
 {
 	if [[ "$install_node_and_modules" = "" ]]; then
 		install_node_and_modules=1
-		curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
-		tar xzvf node-v0.10.20-linux-x64.tar.gz
+		run curl --fail -O http://nodejs.org/dist/v0.10.20/node-v0.10.20-linux-x64.tar.gz
+		run tar xzf node-v0.10.20-linux-x64.tar.gz
 		export PATH=`pwd`/node-v0.10.20-linux-x64/bin:$PATH
 		retry_run 3 rake test:install_deps NODE_MODULES=yes
 	fi

test/integration_tests/nginx_tests.rb

@@ -195,6 +195,7 @@ def create_nginx_controller(options = {})
 			@nginx.add_server do |server|
 				server[:server_name] = "1.passenger.test"
 				server[:root]        = "#{PhusionPassenger.source_root}/test/stub"
+				server[:passenger_friendly_error_pages] = 'on'
 				server << %Q{
 					location ~ ^/subapp(/.*|$) {
 						alias #{@stub.full_app_root}/public$1;