Upgraded to Ruby 2.1.3; Changed timeout value

This commit is contained in:
Al Snow
2014-09-19 19:00:40 -04:00
parent 74d047507a
commit 0957033457
5 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -1 +1 @@
2.1.2 2.1.3
+1 -1
View File
@@ -1,6 +1,6 @@
language: ruby language: ruby
rvm: rvm:
- "2.1.2" - "2.1.3"
before_script: rake db:setup before_script: rake db:setup
before_script: bundle exec rake db:setup before_script: bundle exec rake db:setup
env: RAILSGOAT_MAINTAINER=true env: RAILSGOAT_MAINTAINER=true
+1 -1
View File
@@ -4,7 +4,7 @@ source 'https://rubygems.org'
gem 'rails', '4.0.10' gem 'rails', '4.0.10'
gem 'protected_attributes' # For Rails 4.0+ gem 'protected_attributes' # For Rails 4.0+
ruby '2.1.2' ruby '2.1.3'
# Bundle edge Rails instead: # Bundle edge Rails instead:
# gem 'rails', :git => 'git://github.com/rails/rails.git' # gem 'rails', :git => 'git://github.com/rails/rails.git'
+4 -4
View File
@@ -7,13 +7,13 @@ development:
adapter: sqlite3 adapter: sqlite3
database: db/development.sqlite3 database: db/development.sqlite3
pool: 5 pool: 5
timeout: 25000 timeout: 5000
mysql: mysql:
adapter: mysql2 adapter: mysql2
database: development_railsgoat database: development_railsgoat
pool: 5 pool: 5
timeout: 25000 timeout: 5000
host: localhost host: localhost
username: root username: root
password: password:
@@ -25,10 +25,10 @@ test:
adapter: sqlite3 adapter: sqlite3
database: db/test.sqlite3 database: db/test.sqlite3
pool: 5 pool: 5
timeout: 25000 timeout: 5000
production: production:
adapter: sqlite3 adapter: sqlite3
database: db/production.sqlite3 database: db/production.sqlite3
pool: 5 pool: 5
timeout: 25000 timeout: 5000
+1 -1
View File
@@ -16,7 +16,7 @@ feature 'insecure direct object reference' do
pending(:if => verifying_fixed?) { pending(:if => verifying_fixed?) {
page.status_code.should == 200 page.status_code.should == 200
page.response_headers['Content-Disposition'].should include('database.yml') page.response_headers['Content-Disposition'].should include('database.yml')
page.response_headers['Content-Length'].should == '713' page.response_headers['Content-Length'].should == '709'
} }
end end