diff --git a/.ruby-version b/.ruby-version index b6da512..7e541ae 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.6 \ No newline at end of file +2.2.2 \ No newline at end of file diff --git a/Gemfile b/Gemfile index af47580..7b630fe 100755 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ source 'https://rubygems.org' #don't upgrade gem 'rails', '4.0.13' -ruby '2.1.6' +ruby '2.2.2' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' @@ -40,6 +40,7 @@ group :development, :test, :mysql do gem 'database_cleaner' gem 'poltergeist' gem 'rspec-rails', '2.14.2' + gem 'test-unit' end group :mysql do diff --git a/Gemfile.lock b/Gemfile.lock index fa62db6..321c71c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -27,7 +27,7 @@ GEM tzinfo (~> 0.3.37) addressable (2.3.8) arel (4.0.2) - aruba (0.5.4) + aruba (0.6.2) childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) @@ -72,12 +72,15 @@ GEM execjs coffee-script-source (1.9.1.1) crack (0.3.1) - cucumber (1.3.15) + cucumber (2.0.0) builder (>= 2.1.2) + cucumber-core (~> 1.1.3) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) + multi_test (>= 0.1.2) + cucumber-core (1.1.3) + gherkin (~> 2.12.0) daemons (1.2.2) database_cleaner (1.4.1) debug_inspector (0.0.2) @@ -94,11 +97,11 @@ GEM foreman (0.78.0) thor (~> 0.19.1) formatador (0.2.5) - gauntlt (1.0.10) - aruba (= 0.5.4) - cucumber (= 1.3.15) - nokogiri (= 1.6.1) - trollop (~> 2.0) + gauntlt (1.0.6) + aruba + cucumber + nokogiri (~> 1.5.0) + trollop gherkin (2.12.2) multi_json (~> 1.3) guard (2.12.6) @@ -142,7 +145,7 @@ GEM launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.7) - listen (2.10.0) + listen (2.10.1) celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) @@ -159,14 +162,12 @@ GEM thin (~> 1.5.0) method_source (0.8.2) mime-types (2.6.1) - mini_portile (0.5.3) minitest (4.7.5) multi_json (1.11.1) multi_test (0.1.2) mysql2 (0.3.18) nenv (0.2.0) - nokogiri (1.6.1) - mini_portile (~> 0.5.0) + nokogiri (1.5.11) notiffany (0.0.6) nenv (~> 0.1) shellany (~> 0.0) @@ -177,6 +178,7 @@ GEM websocket-driver (>= 0.2.0) powder (0.3.0) thor (>= 0.11.5) + power_assert (0.2.3) pry (0.10.1) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -260,6 +262,8 @@ GEM sprockets (>= 2.8, < 4.0) sqlite3 (1.3.10) terminal-table (1.4.5) + test-unit (3.1.2) + power_assert therubyracer (0.12.2) libv8 (~> 3.16.14.0) ref @@ -328,8 +332,12 @@ DEPENDENCIES sass-rails simplecov sqlite3 + test-unit therubyracer travis-lint turbolinks uglifier unicorn + +BUNDLED WITH + 1.10.4