diff --git a/Gemfile.lock b/Gemfile.lock index c5c5ec1a..40a1a598 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,15 +12,15 @@ GIT GEM remote: https://rubygems.org/ specs: - acme-client (0.5.5) + acme-client (0.6.1) faraday (~> 0.9, >= 0.9.1) - activesupport (5.1.1) + activesupport (5.1.4) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) annoy (0.5.6) highline (>= 1.5.0) ansi (1.5.0) @@ -28,15 +28,15 @@ GEM bcrypt (3.1.11) blankslate (3.1.3) builder (3.2.3) - byebug (9.0.6) - capybara (2.14.0) + byebug (9.1.0) + capybara (2.16.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - capybara_minitest_spec (1.0.5) + capybara_minitest_spec (1.0.6) capybara (>= 2) minitest (>= 4) certified (1.0.0) @@ -44,32 +44,32 @@ GEM cliver (0.3.2) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) - coderay (1.1.1) + coderay (1.1.2) concurrent-ruby (1.0.5) connection_pool (2.2.1) - coveralls (0.8.21) - json (>= 1.8, < 3) - simplecov (~> 0.14.1) - term-ansicolor (~> 1.3) - thor (~> 0.19.4) - tins (~> 1.6) + coveralls (0.7.1) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.2) + crass (1.0.3) dante (0.2.0) docile (1.1.5) domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) drydock (0.6.9) erubis (2.7.0) - exifr (1.2.5) - fabrication (2.16.1) - facter (2.4.6) - faker (1.7.3) - i18n (~> 0.5) - faraday (0.12.1) + exifr (1.3.3) + fabrication (2.18.0) + facter (2.5.1) + faker (1.8.5) + i18n (~> 0.9.1) + faraday (0.13.1) multipart-post (>= 1.2, < 3) - faraday_middleware (0.11.0.1) + faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) feedjira (2.1.2) faraday (>= 0.9) @@ -82,34 +82,35 @@ GEM gandi (3.3.27) hashie geoip (1.6.3) - hashdiff (0.3.4) - hashie (3.5.5) - highline (1.7.8) + hashdiff (0.3.7) + hashie (3.5.6) + highline (1.7.10) hiredis (0.6.1) hoe (3.14.2) rake (>= 0.8, < 11.0) htmlentities (4.3.4) - http (2.2.2) + http (3.0.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 1.0.1) + http-form_data (>= 2.0.0.pre.pre2, < 3) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.3) + http-form_data (2.0.0) http_parser.rb (0.6.0) - i18n (0.8.1) - image_optim (0.24.3) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + image_optim (0.26.0) exifr (~> 1.2, >= 1.2.2) fspath (~> 3.0) image_size (~> 1.5) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.5.0) + image_optim_pack (0.5.0.20171208) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (1.5.0) - in_threads (1.4.0) + in_threads (1.5.0) io-extra (1.2.8) ipaddress (0.8.3) jimson-temp (0.9.4) @@ -118,84 +119,88 @@ GEM rack (>= 1.4.5) rest-client (>= 1.6.7) json (1.8.6) - loofah (2.0.3) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) m (1.5.1) method_source (>= 0.6.7) rake (>= 0.9.2.2) magic (0.2.9) ffi (>= 0.6.3) - mail (2.6.5) - mime-types (>= 1.16, < 4) + mail (2.7.0) + mini_mime (>= 0.1.1) metaclass (0.0.4) - method_source (0.8.2) + method_source (0.9.0) mime-types (2.99.3) - mini_portile2 (2.2.0) - minitest (5.10.2) - minitest-reporters (1.1.14) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.10.3) + minitest-reporters (1.1.19) ansi builder minitest (>= 5.0) ruby-progressbar - mocha (1.2.1) + mocha (1.3.0) metaclass (~> 0.0.1) mock_redis (0.17.3) - monetize (1.6.0) - money (~> 6.8) - money (6.9.0) - i18n (>= 0.6.4, < 0.9) - msgpack (1.1.0) - multi_json (1.12.1) + monetize (1.7.0) + money (~> 6.9) + money (6.10.0) + i18n (>= 0.6.4, < 1.0) + msgpack (1.2.0) + multi_json (1.12.2) multipart-post (2.0.0) - mustermann (1.0.0) + mustermann (1.0.1) net-scp (1.2.1) net-ssh (>= 2.6.5) - net-ssh (4.1.0) + net-ssh (4.2.0) netrc (0.11.0) - nokogiri (1.8.0) - mini_portile2 (~> 2.2.0) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) nokogumbo (1.4.13) nokogiri - ox (2.5.0) + ox (2.8.2) paypal-recurring (1.1.0) pg (0.21.0) - poltergeist (1.15.0) + poltergeist (1.16.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - progress (3.3.1) - pry (0.10.4) + progress (3.4.0) + pry (0.11.3) coderay (~> 1.1.0) - method_source (~> 0.8.1) - slop (~> 3.4) - pry-byebug (3.4.2) - byebug (~> 9.0) + method_source (~> 0.9.0) + pry-byebug (3.5.1) + byebug (~> 9.1) pry (~> 0.10) - public_suffix (2.0.5) - puma (3.8.2) + public_suffix (3.0.1) + puma (3.11.0) rack (2.0.3) - rack-cache (1.7.0) + rack-cache (1.7.1) rack (>= 0.4) rack-protection (2.0.0) rack rack-recaptcha (0.6.6) json - rack-test (0.6.3) - rack (>= 1.0) + rack-test (0.8.2) + rack (>= 1.0, < 3) rack_session_access (0.1.1) builder (>= 2.0.0) rack (>= 1.0.0) rake (10.5.0) - redis (3.3.3) - redis-namespace (1.5.3) - redis (~> 3.0, >= 3.0.4) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) + redis (3.3.5) + redis-namespace (1.6.0) + redis (>= 3.0.4) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) netrc (~> 0.7) - rinku (2.0.2) + rinku (2.0.4) rmagick (2.16.0) - ruby-progressbar (1.8.1) + ruby-progressbar (1.9.0) rye (0.9.13) annoy docile (>= 1.0.1) @@ -204,16 +209,20 @@ GEM net-ssh (>= 2.0.13) sysinfo (>= 0.8.1) safe_yaml (1.0.4) - sanitize (4.4.0) + sanitize (4.5.0) crass (~> 1.0.2) nokogiri (>= 1.4.4) nokogumbo (~> 1.4.1) - sass (3.4.24) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sax-machine (1.3.2) - sequel (4.48.0) - sequel_pg (1.7.0) - pg (>= 0.8.0) - sequel (>= 4.0.0) + sequel (5.3.0) + sequel_pg (1.8.0) + pg (>= 0.18.0) + sequel (>= 4.34.0) shotgun (0.9.2) rack (>= 1.0) sidekiq (4.1.4) @@ -221,12 +230,12 @@ GEM connection_pool (~> 2.2, >= 2.2.0) redis (~> 3.2, >= 3.2.1) sinatra (>= 1.4.7) - simplecov (0.14.1) + simplecov (0.15.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.1) - simpleidn (0.0.7) + simplecov-html (0.10.2) + simpleidn (0.0.9) sinatra (2.0.0) mustermann (~> 1.0) rack (~> 2.0) @@ -236,7 +245,6 @@ GEM 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) @@ -251,28 +259,28 @@ GEM storable term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.4) + thor (0.20.0) thread (0.2.2) thread_safe (0.3.6) - tilt (2.0.7) - timecop (0.8.1) - tins (1.14.0) - tzinfo (1.2.3) + tilt (2.0.8) + timecop (0.9.1) + tins (1.16.3) + tzinfo (1.2.4) thread_safe (~> 0.1) unf (0.1.4) unf_ext unf_ext (0.0.7.4) uuidtools (2.1.5) - webmock (3.0.1) + webmock (3.1.1) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff - websocket-driver (0.6.5) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) - will_paginate (3.1.5) + websocket-extensions (0.1.3) + will_paginate (3.1.6) xmlrpc (0.3.0) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) zipruby (0.3.6) @@ -355,4 +363,4 @@ DEPENDENCIES zipruby BUNDLED WITH - 1.15.1 + 1.16.0 diff --git a/tests/environment.rb b/tests/environment.rb index 9fef6fd0..04a9f762 100644 --- a/tests/environment.rb +++ b/tests/environment.rb @@ -2,9 +2,9 @@ ENV['RACK_ENV'] = 'test' raise 'Forget it.' if ENV['RACK_ENV'] == 'production' require 'coveralls' -require 'simplecov' +#require 'simplecov' require 'mock_redis' - +=begin SimpleCov.formatters = [ SimpleCov::Formatter::HTMLFormatter, Coveralls::SimpleCov::Formatter @@ -16,7 +16,7 @@ SimpleCov.start do end SimpleCov.command_name 'minitest' - +=end require 'rack_session_access' require './environment' require './app'