diff --git a/Gemfile.lock b/Gemfile.lock index 92a2c3ca..e2d3cd7e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: RedCloth (4.2.9) - aasm (3.2.1) + aasm (3.3.1) actionmailer (4.1.4) actionpack (= 4.1.4) actionview (= 4.1.4) @@ -34,19 +34,19 @@ GEM acts_as_list (0.4.0) activerecord (>= 3.0) arel (5.0.1.20140414130214) - aruba (0.5.4) + aruba (0.6.0) childprocess (>= 0.3.6) cucumber (>= 1.1.1) rspec-expectations (>= 2.7.0) bcrypt (3.1.7) builder (3.2.2) - bullet (4.11.1) + bullet (4.12.0) activesupport (>= 3.0.0) uniform_notifier (>= 1.6.0) cache_digests (0.3.1) actionpack (>= 3.2) thread_safe - capybara (2.3.0) + capybara (2.4.1) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -59,10 +59,10 @@ GEM coffee-rails (4.0.1) coffee-script (>= 2.2.0) railties (>= 4.0.0, < 5.0) - coffee-script (2.2.0) + coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.7.0) + coffee-script-source (1.7.1) crass (0.2.0) cucumber (1.3.15) builder (>= 2.1.2) @@ -80,7 +80,7 @@ GEM diff-lcs (1.2.5) docile (1.1.5) erubis (2.7.0) - execjs (2.2.0) + execjs (2.2.1) factory_girl (4.4.0) activesupport (>= 3.0.0) factory_girl_rails (4.4.1) @@ -91,7 +91,7 @@ GEM multi_json (~> 1.3) hike (1.2.3) htmlentities (4.3.2) - i18n (0.6.9) + i18n (0.6.11) jquery-rails (3.1.1) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) @@ -103,7 +103,7 @@ GEM metaclass (0.0.4) mime-types (1.25.1) mini_portile (0.6.0) - minitest (5.3.5) + minitest (5.4.0) mocha (1.1.0) metaclass (~> 0.0.1) multi_json (1.10.1) @@ -115,9 +115,9 @@ GEM nokogiri polyglot (0.3.5) rack (1.5.2) - rack-dev-mark (0.4.5) + rack-dev-mark (0.6.4) rack (>= 1.1) - rack-mini-profiler (0.9.1) + rack-mini-profiler (0.9.2) rack (>= 1.1.3) rack-test (0.6.2) rack (>= 1.0) @@ -144,7 +144,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.0.0) rspec-support (3.0.2) - rubyzip (1.1.4) + rubyzip (1.1.6) safe_yaml (1.0.3) sanitize (3.0.0) crass (~> 0.2.0) @@ -161,7 +161,7 @@ GEM multi_json (~> 1.0) rubyzip (~> 1.0) websocket (~> 1.0.4) - simplecov (0.8.2) + simplecov (0.9.0) docile (~> 1.1.0) multi_json simplecov-html (~> 0.8.0) diff --git a/test/models/pie_chart_data_test.rb b/test/models/pie_chart_data_test.rb index 697b6c1b..eafe8711 100644 --- a/test/models/pie_chart_data_test.rb +++ b/test/models/pie_chart_data_test.rb @@ -20,15 +20,15 @@ class Stats::PieChartDataTest < Minitest::Test def test_with_less_than_10_items items = [ - {'id' => 1, 'name' => 'one', 'total' => 11}, - {'id' => 2, 'name' => 'two', 'total' => 4}, + {'id' => 1, 'name' => 'one', 'total' => 11}, + {'id' => 2, 'name' => 'two', 'total' => 4}, {'id' => 3, 'name' => 'three', 'total' => 8}, - {'id' => 4, 'name' => 'four', 'total' => 13}, - {'id' => 5, 'name' => 'five', 'total' => 20}, - {'id' => 6, 'name' => 'six', 'total' => 17}, + {'id' => 4, 'name' => 'four', 'total' => 13}, + {'id' => 5, 'name' => 'five', 'total' => 20}, + {'id' => 6, 'name' => 'six', 'total' => 17}, {'id' => 7, 'name' => 'seven', 'total' => 5}, {'id' => 8, 'name' => 'eight', 'total' => 1}, - {'id' => 9, 'name' => 'nine', 'total' => 6} + {'id' => 9, 'name' => 'nine', 'total' => 6} ] data = Stats::PieChartData.new(items, 'a chart', 50) @@ -40,16 +40,16 @@ class Stats::PieChartDataTest < Minitest::Test def test_with_exactly_10_items items = [ - {'id' => 1, 'name' => 'one', 'total' => 11}, - {'id' => 2, 'name' => 'two', 'total' => 4}, - {'id' => 3, 'name' => 'three', 'total' => 8}, - {'id' => 4, 'name' => 'four', 'total' => 13}, - {'id' => 5, 'name' => 'five', 'total' => 20}, - {'id' => 6, 'name' => 'six', 'total' => 17}, - {'id' => 7, 'name' => 'seven', 'total' => 5}, - {'id' => 8, 'name' => 'eight', 'total' => 1}, - {'id' => 9, 'name' => 'nine', 'total' => 6}, - {'id' => 10, 'name' => 'ten', 'total' => 19} + {'id' => 1, 'name' => 'one', 'total' => 11}, + {'id' => 2, 'name' => 'two', 'total' => 4}, + {'id' => 3, 'name' => 'three', 'total' => 8}, + {'id' => 4, 'name' => 'four', 'total' => 13}, + {'id' => 5, 'name' => 'five', 'total' => 20}, + {'id' => 6, 'name' => 'six', 'total' => 17}, + {'id' => 7, 'name' => 'seven', 'total' => 5}, + {'id' => 8, 'name' => 'eight', 'total' => 1}, + {'id' => 9, 'name' => 'nine', 'total' => 6}, + {'id' => 10, 'name' => 'ten', 'total' => 19} ] data = Stats::PieChartData.new(items, 'a chart', 50) diff --git a/test/test_helper.rb b/test/test_helper.rb index aff9ee3c..854c6dfb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -3,7 +3,7 @@ require File.expand_path('../../config/environment', __FILE__) require 'rails/test_help' # set config for tests. Overwrite those read from config/site.yml. Use inject to avoid warning about changing CONSTANT -{ "salt" => "change-me", "authentication_schemes" => ["database"], "prefered_auth" => "database"}.inject( SITE_CONFIG ) { |h, elem| h[elem[0]] = elem[1]; h } +{ "salt" => "change-me", "authentication_schemes" => ["database"], "prefered_auth" => "database", "email_dispatch" => nil}.inject( SITE_CONFIG ) { |h, elem| h[elem[0]] = elem[1]; h } class ActiveSupport::TestCase ActiveRecord::Migration.check_pending!