team-alpha/railsgoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #64 from jasnow/master

Browse Source 
Rebuilt Gemfile.lock file. Fixed test by using "$" instead of "@@"
This commit is contained in:
mccabe615
2013-11-12 12:06:47 -08:00
parent f8fbc93c75 46128211e1
commit 032581b3da
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gemfile.lock
+6 -6
View File
@@ -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)
@@ -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)
@@ -226,7 +226,7 @@ GEM
multi_json multi_json
simplecov-html (~> 0.7.1) simplecov-html (~> 0.7.1)
simplecov-html (0.7.1) simplecov-html (0.7.1)
slim (2.0.1) slim (2.0.2)
temple (~> 0.6.6) temple (~> 0.6.6)
tilt (>= 1.3.3, < 2.1) tilt (>= 1.3.3, < 2.1)
slop (2.1.0) slop (2.1.0)
@@ -251,9 +251,9 @@ GEM
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
trollop (2.0) trollop (2.0)
tzinfo (0.3.38) tzinfo (0.3.38)
uglifier (2.2.1) uglifier (2.3.0)
execjs (>= 0.3.0) execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2) json (>= 1.8.0)
unicorn (4.6.3) unicorn (4.6.3)
kgio (~> 2.6) kgio (~> 2.6)
rack rack
spec/support/capybara_shared.rb
+4 -4
View File
@@ -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
@@ -80,4 +80,4 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor) Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor)
end end
Capybara.javascript_driver = :poltergeist Capybara.javascript_driver = :poltergeist