diff --git a/.gitignore b/.gitignore index eaa4a86e..51bb0eed 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,3 @@ files/sslsites.zip .vagrant public/banned_sites public/deleted_sites -Gemfile.lock diff --git a/Gemfile b/Gemfile index a98cc309..aaf4e354 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,6 @@ gem 'rmagick', require: nil gem 'sidekiq' gem 'ago' gem 'mail' -gem 'google-api-client', require: 'google/api_client' gem 'tilt' gem 'erubis' gem 'stripe', '1.15.0' #, source: 'https://code.stripe.com/' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..d9f70b50 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,310 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (4.2.4) + i18n (~> 0.7) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.3, >= 0.3.4) + tzinfo (~> 1.1) + addressable (2.3.8) + ago (0.1.5) + annoy (0.5.6) + highline (>= 1.5.0) + ansi (1.5.0) + base32 (0.3.2) + bcrypt (3.1.10) + blankslate (3.1.3) + builder (3.2.2) + byebug (5.0.0) + columnize (= 0.9.0) + capybara (2.5.0) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara_minitest_spec (1.0.5) + capybara (>= 2) + minitest (>= 4) + celluloid (0.17.2) + celluloid-essentials + celluloid-extras + celluloid-fsm + celluloid-pool + celluloid-supervision + timers (>= 4.1.1) + celluloid-essentials (0.20.5) + timers (>= 4.1.1) + celluloid-extras (0.20.5) + timers (>= 4.1.1) + celluloid-fsm (0.20.5) + timers (>= 4.1.1) + celluloid-pool (0.20.5) + timers (>= 4.1.1) + celluloid-supervision (0.20.5) + timers (>= 4.1.1) + climate_control (0.0.3) + activesupport (>= 3.0) + cliver (0.3.2) + cocaine (0.5.7) + climate_control (>= 0.0.3, < 1.0) + coderay (1.1.0) + columnize (0.9.0) + connection_pool (2.2.0) + coveralls (0.8.3) + json (~> 1.8) + rest-client (>= 1.6.8, < 2) + simplecov (~> 0.10.0) + term-ansicolor (~> 1.3) + thor (~> 0.19.1) + crack (0.4.2) + safe_yaml (~> 1.0.0) + crass (1.0.2) + dante (0.2.0) + dav4rack (0.3.0) + nokogiri (>= 1.4.2) + rack (>= 1.1.0) + uuidtools (~> 2.1.1) + dnsruby (1.58.0) + docile (1.1.5) + domain_name (0.5.25) + unf (>= 0.0.5, < 1.0.0) + drydock (0.6.9) + erubis (2.7.0) + fabrication (2.14.1) + faker (1.5.0) + i18n (~> 0.5) + ffi (1.9.10) + ffi-compiler (0.1.3) + ffi (>= 1.0.0) + rake + filesize (0.1.1) + geoip (1.6.1) + hashdiff (0.2.2) + highline (1.7.8) + hiredis (0.6.0) + hitimes (1.2.3) + http-cookie (1.0.2) + domain_name (~> 0.5) + i18n (0.7.0) + io-extra (1.2.8) + jimson-temp (0.9.5) + blankslate (>= 3.1.2) + multi_json (~> 1.0) + rack (~> 1.4) + rest-client (~> 1.0) + json (1.8.3) + m (1.4.0) + method_source (>= 0.6.7) + rake (>= 0.9.2.2) + magic (0.2.9) + ffi (>= 0.6.3) + mail (2.6.3) + mime-types (>= 1.16, < 3) + metaclass (0.0.4) + method_source (0.8.2) + mime-types (2.6.2) + mini_portile (0.6.2) + minitest (5.8.1) + minitest-reporters (1.1.3) + ansi + builder + minitest (>= 5.0) + ruby-progressbar + mocha (1.1.0) + metaclass (~> 0.0.1) + multi_json (1.11.2) + net-scp (1.2.1) + net-ssh (>= 2.6.5) + net-ssh (3.0.1) + netrc (0.10.3) + nokogiri (1.6.6.2) + mini_portile (~> 0.6.0) + nokogumbo (1.4.7) + nokogiri + pg (0.18.3) + poltergeist (1.7.0) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + posix-spawn (0.3.11) + pry (0.10.3) + coderay (~> 1.1.0) + method_source (~> 0.8.1) + slop (~> 3.4) + pry-byebug (3.2.0) + byebug (~> 5.0) + pry (~> 0.10) + puma (2.14.0) + rack (1.6.4) + rack-cache (1.5.0) + rack (>= 0.4) + rack-protection (1.5.3) + rack + rack-recaptcha (0.6.6) + json + rack-test (0.6.3) + rack (>= 1.0) + rack_session_access (0.1.1) + builder (>= 2.0.0) + rack (>= 1.0.0) + rake (10.4.2) + redis (3.2.1) + redis-namespace (1.5.2) + redis (~> 3.0, >= 3.0.4) + rest-client (1.8.0) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 3.0) + netrc (~> 0.7) + rmagick (2.15.4) + ruby-progressbar (1.7.5) + rye (0.9.13) + annoy + docile (>= 1.0.1) + highline (>= 1.5.1) + net-scp (>= 1.0.2) + net-ssh (>= 2.0.13) + sysinfo (>= 0.8.1) + safe_yaml (1.0.4) + sanitize (4.0.1) + crass (~> 1.0.2) + nokogiri (>= 1.4.4) + nokogumbo (~> 1.4.1) + sass (3.4.19) + scrypt (2.0.2) + ffi-compiler (>= 0.0.2) + rake + sequel (4.8.0) + sequel_pg (1.6.13) + pg (>= 0.8.0) + sequel (>= 3.39.0) + shotgun (0.9.1) + rack (>= 1.0) + sidekiq (3.5.1) + celluloid (~> 0.17.2) + connection_pool (~> 2.2, >= 2.2.0) + json (~> 1.0) + redis (~> 3.2, >= 3.2.1) + redis-namespace (~> 1.5, >= 1.5.2) + simplecov (0.10.0) + docile (~> 1.1.0) + json (~> 1.8) + simplecov-html (~> 0.10.0) + simplecov-html (0.10.0) + sinatra (1.4.6) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (>= 1.3, < 3) + sinatra-flash (0.3.0) + sinatra (>= 1.0.0) + sinatra-xsendfile (0.4.2) + sinatra (>= 0.9.1) + slop (3.6.0) + storable (0.8.9) + stripe (1.15.0) + json (~> 1.8.1) + mime-types (>= 1.25, < 3.0) + rest-client (~> 1.4) + stripe-ruby-mock (2.0.1) + dante (>= 0.2.0) + jimson-temp + stripe (>= 1.15.0) + sysinfo (0.8.1) + drydock + storable + term-ansicolor (1.3.2) + tins (~> 1.0) + thor (0.19.1) + thread (0.2.2) + thread_safe (0.3.5) + tilt (2.0.1) + timecop (0.8.0) + timers (4.1.1) + hitimes + tins (1.6.0) + tzinfo (1.2.2) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.1) + uuidtools (2.1.5) + webmock (1.22.1) + addressable (>= 2.3.6) + crack (>= 0.3.2) + hashdiff + websocket-driver (0.6.2) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) + will_paginate (3.1.0) + xpath (2.0.0) + nokogiri (~> 1.3) + zipruby (0.3.6) + +PLATFORMS + ruby + +DEPENDENCIES + ago + base32 + bcrypt + capybara_minitest_spec + cocaine + coveralls + dav4rack + dnsruby + erubis + fabrication + faker + filesize + geoip + hiredis + io-extra + jdbc-postgres + jruby-openssl + json + m + magic + mail + minitest + minitest-reporters + mocha + pg + poltergeist + posix-spawn + pry + pry-byebug + puma + rack-cache + rack-recaptcha + rack-test + rack_session_access + rake + redis + rest-client + rmagick + ruby-debug + rye + sanitize + sass + scrypt + sequel (= 4.8.0) + sequel_pg + shotgun + sidekiq + simplecov + sinatra + sinatra-flash + sinatra-xsendfile + stripe (= 1.15.0) + stripe-ruby-mock (= 2.0.1) + thread + tilt + timecop + webmock + will_paginate + zipruby + +BUNDLED WITH + 1.11.2 diff --git a/tests/acceptance/environment.rb b/tests/acceptance/environment.rb index 352aeafd..c8154237 100644 --- a/tests/acceptance/environment.rb +++ b/tests/acceptance/environment.rb @@ -1,9 +1,12 @@ require_relative '../environment' +require 'capybara' +require 'capybara/dsl' +require 'capybara/poltergeist' +require 'rack_session_access/capybara' + Capybara.app = Sinatra::Application def teardown Capybara.reset_sessions! end - -Capybara.default_wait_time = 5 diff --git a/tests/environment.rb b/tests/environment.rb index d8d148bb..fd4d8d33 100644 --- a/tests/environment.rb +++ b/tests/environment.rb @@ -4,7 +4,7 @@ raise 'Forget it.' if ENV['RACK_ENV'] == 'production' require 'coveralls' require 'simplecov' -SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ +SimpleCov.formatters = [ SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter ] @@ -35,9 +35,6 @@ Sinatra::Application.configure do |app| app.use RackSessionAccess::Middleware end -require 'capybara/poltergeist' -require 'rack_session_access/capybara' - Site.bcrypt_cost = BCrypt::Engine::MIN_COST MiniTest::Reporters.use! MiniTest::Reporters::SpecReporter.new