1. Changed 1.9.3 to 2.0.0 in .rvmrc, .travis.yml, Gemfile, README.md.
2. Rebuilt Gemfile.lock file. 3. Changed "@@" (class var) to "$" (global var) in spec/support/capybara_shared.rb
This commit is contained in:
@@ -1 +1 @@
|
|||||||
rvm use 1.9.3@railsgoat --create
|
rvm use 2.0.0@railsgoat --create
|
||||||
|
|||||||
+1
-1
@@ -1,5 +1,5 @@
|
|||||||
language: ruby
|
language: ruby
|
||||||
rvm:
|
rvm:
|
||||||
- "1.9.3"
|
- "2.0.0"
|
||||||
before_script: rake db:setup
|
before_script: rake db:setup
|
||||||
env: RAILSGOAT_MAINTAINER=true
|
env: RAILSGOAT_MAINTAINER=true
|
||||||
@@ -2,13 +2,14 @@ source 'https://rubygems.org'
|
|||||||
|
|
||||||
gem 'rails', '3.2.15'
|
gem 'rails', '3.2.15'
|
||||||
|
|
||||||
|
ruby '2.0.0'
|
||||||
|
|
||||||
# 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'
|
||||||
|
|
||||||
gem 'sqlite3'
|
gem 'sqlite3'
|
||||||
gem 'foreman'
|
gem 'foreman'
|
||||||
|
|
||||||
|
|
||||||
group :development do
|
group :development do
|
||||||
gem 'brakeman'
|
gem 'brakeman'
|
||||||
gem 'bundler-audit'
|
gem 'bundler-audit'
|
||||||
|
|||||||
+4
-4
@@ -40,11 +40,11 @@ GEM
|
|||||||
erubis (>= 2.6.6)
|
erubis (>= 2.6.6)
|
||||||
binding_of_caller (0.7.2)
|
binding_of_caller (0.7.2)
|
||||||
debug_inspector (>= 0.0.1)
|
debug_inspector (>= 0.0.1)
|
||||||
brakeman (2.1.2)
|
brakeman (2.2.0)
|
||||||
erubis (~> 2.6)
|
erubis (~> 2.6)
|
||||||
fastercsv (~> 1.5)
|
fastercsv (~> 1.5)
|
||||||
haml (>= 3.0, < 5.0)
|
haml (>= 3.0, < 5.0)
|
||||||
highline (~> 1.6.19)
|
highline (~> 1.6.20)
|
||||||
multi_json (~> 1.2)
|
multi_json (~> 1.2)
|
||||||
ruby2ruby (~> 2.0.5)
|
ruby2ruby (~> 2.0.5)
|
||||||
ruby_parser (~> 3.2.2)
|
ruby_parser (~> 3.2.2)
|
||||||
@@ -91,7 +91,7 @@ GEM
|
|||||||
eventmachine (1.0.3)
|
eventmachine (1.0.3)
|
||||||
execjs (2.0.2)
|
execjs (2.0.2)
|
||||||
fastercsv (1.5.5)
|
fastercsv (1.5.5)
|
||||||
ffi (1.9.1)
|
ffi (1.9.0)
|
||||||
foreman (0.63.0)
|
foreman (0.63.0)
|
||||||
dotenv (>= 0.7)
|
dotenv (>= 0.7)
|
||||||
thor (>= 0.13.6)
|
thor (>= 0.13.6)
|
||||||
@@ -136,7 +136,7 @@ GEM
|
|||||||
launchy (2.3.0)
|
launchy (2.3.0)
|
||||||
addressable (~> 2.3)
|
addressable (~> 2.3)
|
||||||
libv8 (3.16.14.3)
|
libv8 (3.16.14.3)
|
||||||
listen (2.1.1)
|
listen (2.1.2)
|
||||||
celluloid (>= 0.15.2)
|
celluloid (>= 0.15.2)
|
||||||
rb-fsevent (>= 0.9.3)
|
rb-fsevent (>= 0.9.3)
|
||||||
rb-inotify (>= 0.9)
|
rb-inotify (>= 0.9)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
cd railsgoat
|
cd railsgoat
|
||||||
|
|
||||||
rvm use 1.9.3@railsgoat --create # https://rvm.io/
|
rvm use 2.0.0@railsgoat --create # https://rvm.io/
|
||||||
|
|
||||||
bundle
|
bundle
|
||||||
|
|
||||||
|
|||||||
@@ -5,12 +5,12 @@
|
|||||||
# However, RailsGoat maintainers need the Capybara features to pass to indicate
|
# However, RailsGoat maintainers need the Capybara features to pass to indicate
|
||||||
# changes to the site have not inadvertently removed or fixed any vulnerabilities
|
# changes to the site have not inadvertently removed or fixed any vulnerabilities
|
||||||
# since the whole point is to provide a site for a developer to fix.
|
# since the whole point is to provide a site for a developer to fix.
|
||||||
@@displayed_spec_notice = false
|
$displayed_spec_notice = false
|
||||||
|
|
||||||
def verifying_fixed?
|
def verifying_fixed?
|
||||||
maintainer_env_name = 'RAILSGOAT_MAINTAINER'
|
maintainer_env_name = 'RAILSGOAT_MAINTAINER'
|
||||||
result = !ENV[maintainer_env_name]
|
result = !ENV[maintainer_env_name]
|
||||||
if !@@displayed_spec_notice && result
|
if !$displayed_spec_notice && result
|
||||||
puts <<-NOTICE
|
puts <<-NOTICE
|
||||||
|
|
||||||
******************************************************************************
|
******************************************************************************
|
||||||
@@ -30,7 +30,7 @@ def verifying_fixed?
|
|||||||
a 'pending' state.
|
a 'pending' state.
|
||||||
******************************************************************************
|
******************************************************************************
|
||||||
NOTICE
|
NOTICE
|
||||||
@@displayed_spec_notice = true
|
$displayed_spec_notice = true
|
||||||
end
|
end
|
||||||
result
|
result
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user