From 917b2c580bc78602d9963fa2cd85a40c0c621994 Mon Sep 17 00:00:00 2001 From: elijah Date: Mon, 14 Aug 2017 15:21:32 -0700 Subject: pin to the newest psych gem, so as to not hit bugs in older versions (required by faker) --- Gemfile | 1 + Gemfile.lock | 176 ++++++++++++++++++++++++++++++++--------------------------- 2 files changed, 97 insertions(+), 80 deletions(-) diff --git a/Gemfile b/Gemfile index 3b5435e..744ef5f 100644 --- a/Gemfile +++ b/Gemfile @@ -68,6 +68,7 @@ group :test do # generating test data gem 'factory_girl_rails' # test data factories gem 'faker' # names and numbers for test data + gem 'psych', '~> 2.2.4' # needed by faker # billing tests gem 'fake_braintree', require: false diff --git a/Gemfile.lock b/Gemfile.lock index aa52649..0ac293b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -26,62 +26,62 @@ GEM remote: https://rubygems.org/ specs: SyslogLogger (2.0) - actionmailer (4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) + actionmailer (4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.8) - actionview (= 4.2.8) - activesupport (= 4.2.8) + actionpack (4.2.9) + actionview (= 4.2.9) + activesupport (= 4.2.9) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.8) - activesupport (= 4.2.8) + actionview (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.8) - activesupport (= 4.2.8) + activejob (4.2.9) + activesupport (= 4.2.9) globalid (>= 0.3.0) - activemodel (4.2.8) - activesupport (= 4.2.8) + activemodel (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) - activerecord (4.2.8) - activemodel (= 4.2.8) - activesupport (= 4.2.8) + activerecord (4.2.9) + activemodel (= 4.2.9) + activesupport (= 4.2.9) arel (~> 6.0) - activesupport (4.2.8) + activesupport (4.2.9) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - addressable (2.5.0) + addressable (2.5.1) public_suffix (~> 2.0, >= 2.0.2) arel (6.0.4) - autoprefixer-rails (6.7.7) + autoprefixer-rails (7.1.2.4) execjs - better_errors (2.1.1) + better_errors (2.3.0) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - braintree (2.72.0) + braintree (2.76.0) builder (>= 2.0.0) buftok (0.2.0) builder (3.2.3) byebug (9.0.6) - capybara (2.12.1) + capybara (2.15.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -118,18 +118,19 @@ GEM multi_test (>= 0.1.2) cucumber-core (1.5.0) gherkin (~> 4.0) - cucumber-rails (1.4.5) + cucumber-rails (1.5.0) capybara (>= 1.1.2, < 3) cucumber (>= 1.3.8, < 4) - mime-types (>= 1.16, < 4) + mime-types (>= 1.17, < 4) nokogiri (~> 1.5) - railties (>= 3, < 5.1) + railties (>= 4, < 5.2) cucumber-wire (0.0.1) - debug_inspector (0.0.2) + debug_inspector (0.0.3) diff-lcs (1.3) - domain_name (0.5.20170223) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) equalizer (0.0.11) + erubi (1.6.1) erubis (2.7.0) execjs (2.7.0) factory_girl (4.8.0) @@ -142,46 +143,47 @@ GEM braintree (~> 2.32) capybara (>= 2.2.0) sinatra - faker (1.7.3) + faker (1.8.4) i18n (~> 0.5) faraday (0.11.0) multipart-post (>= 1.2, < 3) ffi (1.9.18) - gherkin (4.1.0) - globalid (0.3.7) - activesupport (>= 4.1.0) - haml (4.0.7) + gherkin (4.1.3) + globalid (0.4.0) + activesupport (>= 4.2.0) + haml (5.0.2) + temple (>= 0.8.0) tilt - haml-rails (0.9.0) + haml-rails (1.0.0) actionpack (>= 4.0.1) activesupport (>= 4.0.1) - haml (>= 4.0.6, < 5.0) + haml (>= 4.0.6, < 6.0) html2haml (>= 1.0.1) railties (>= 4.0.1) - html2haml (2.1.0) + html2haml (2.2.0) erubis (~> 2.7.0) - haml (~> 4.0) + haml (>= 4.0, < 6) nokogiri (>= 1.6.0) ruby_parser (~> 3.5) - http (2.2.1) + http (2.2.2) addressable (~> 2.3) http-cookie (~> 1.0) http-form_data (~> 1.0.1) http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (1.0.1) - http_accept_language (2.1.0) + http-form_data (1.0.3) + http_accept_language (2.1.1) http_parser.rb (0.6.0) httpclient (2.8.3) - i18n (0.8.1) + i18n (0.8.6) i18n-missing_translations (0.0.1) - jquery-rails (4.2.2) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js_regex (1.2.1) - regexp_parser (>= 0.3.6, <= 0.4.2) + js_regex (1.2.3) + regexp_parser (>= 0.3.6, <= 0.5.0) kaminari (1.0.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.0.1) @@ -196,10 +198,10 @@ GEM kaminari-core (1.0.1) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.19-x86_64-linux) + libv8 (3.16.14.19) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.4) + mail (2.6.6) mime-types (>= 1.16, < 4) memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) @@ -208,8 +210,9 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.10.1) + mini_mime (0.1.4) + mini_portile2 (2.2.0) + minitest (5.10.3) minitest-stub-const (0.6) mocha (1.2.1) metaclass (~> 0.0.1) @@ -217,11 +220,11 @@ GEM multi_test (0.1.2) multipart-post (2.0.0) naught (1.1.0) - nokogiri (1.7.0.1) - mini_portile2 (~> 2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) phantomjs-binaries (2.1.1.1) sys-uname (= 0.9.0) - poltergeist (1.13.0) + poltergeist (1.16.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) @@ -229,22 +232,23 @@ GEM coderay (~> 1.1.0) method_source (~> 0.8.1) slop (~> 3.4) + psych (2.2.4) public_suffix (2.0.5) - rack (1.6.5) + rack (1.6.8) rack-protection (1.5.3) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.8) - actionmailer (= 4.2.8) - actionpack (= 4.2.8) - actionview (= 4.2.8) - activejob (= 4.2.8) - activemodel (= 4.2.8) - activerecord (= 4.2.8) - activesupport (= 4.2.8) + rails (4.2.9) + actionmailer (= 4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) + activemodel (= 4.2.9) + activerecord (= 4.2.9) + activesupport (= 4.2.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.8) + railties (= 4.2.9) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -259,31 +263,39 @@ GEM railties (~> 4.0) rails_warden (0.5.8) warden (>= 1.0.0) - railties (4.2.8) - actionpack (= 4.2.8) - activesupport (= 4.2.8) + railties (4.2.9) + actionpack (= 4.2.9) + activesupport (= 4.2.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (12.0.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rdiscount (2.2.0.1) ref (2.0.0) - regexp_parser (0.4.2) - responders (2.3.0) - railties (>= 4.2.0, < 5.1) + regexp_parser (0.4.4) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) ruby-srp (0.2.1) - ruby_parser (3.8.4) - sexp_processor (~> 4.1) - sass (3.4.23) + ruby_parser (3.10.1) + sexp_processor (~> 4.9) + sass (3.5.1) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sexp_processor (4.8.0) - simple_form (3.4.0) - actionpack (> 4, < 5.1) - activemodel (> 4, < 5.1) + sexp_processor (4.10.0) + simple_form (3.5.0) + actionpack (> 4, < 5.2) + activemodel (> 4, < 5.2) simple_oauth (0.3.1) sinatra (1.4.8) rack (~> 1.5) @@ -299,12 +311,13 @@ GEM sprockets (>= 3.0.0) sys-uname (0.9.0) ffi (>= 1.0.0) + temple (0.8.0) therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.6) + tilt (2.0.8) twitter (6.1.0) addressable (~> 2.5) buftok (~> 0.2.0) @@ -315,11 +328,13 @@ GEM memoizable (~> 0.4.2) naught (~> 1.1) simple_oauth (~> 0.3.1) - tzinfo (1.2.2) + tzinfo (1.2.3) thread_safe (~> 0.1) - uglifier (3.1.7) + uglifier (3.2.0) execjs (>= 0.3.0, < 3) - unf (0.2.0.beta2) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.4) valid_email (0.0.13) activemodel mail (~> 2.6.1) @@ -328,7 +343,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -365,6 +380,7 @@ DEPENDENCIES phantomjs-binaries poltergeist pry + psych (~> 2.2.4) rails (~> 4.2.7) rails-i18n rails_warden -- cgit v1.2.3