Fix flapping tests

Signed-off-by: David Celis <me@davidcel.is>
davidcelis · Mar 11, 2015 · df82439 · df82439
1 parent 76c0ddc
commit df82439
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -42,7 +42,7 @@ matrix:
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.1.0
       gemfile: gemfiles/rails_edge.gemfile
-    - jruby-21mode
+    - rvm: jruby-21mode
       gemfile: gemfiles/rails_edge.gemfile
     - rvm: 2.2.0
       gemfile: gemfiles/rails_31.gemfile

diff --git a/gemfiles/rails_edge.gemfile b/gemfiles/rails_edge.gemfile
@@ -2,6 +2,7 @@ source 'https://rubygems.org/'
 gemspec :path => '../'
 
 gem 'rails', github: 'rails/rails'
+gem 'arel', github: 'rails/arel'
 
 gem 'sqlite3', :platform => :ruby
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
diff --git a/recommendable.gemspec b/recommendable.gemspec
@@ -24,7 +24,7 @@ EOF
   s.add_dependency 'redis',         '>= 2.2.0'
   s.add_dependency 'hooks',         '>= 0.2.1'
 
-  s.add_development_dependency 'minitest', '>= 4.2'
+  s.add_development_dependency 'minitest', '~> 4.2'
   s.add_development_dependency 'minifacture'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rails', '>= 3.1.0'

diff --git a/test/dummy/config/initializers/recommendable.rb b/test/dummy/config/initializers/recommendable.rb
@@ -3,4 +3,5 @@
 
 Recommendable.configure do |config|
   config.redis = Redis.new(:host => 'localhost', :port => 6379, :db => 15)
+  config.user_class = User
 end
diff --git a/test/recommendable/helpers/calculations_test.rb b/test/recommendable/helpers/calculations_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class CalculationsTest < MiniTest::Unit::TestCase
+class CalculationsTest < Minitest::Test
   def setup
     @user = Factory(:user)
     5.times  { |x| instance_variable_set(:"@user#{x+1}",  Factory(:user))  }

diff --git a/test/recommendable/helpers/redis_key_mapper_test.rb b/test/recommendable/helpers/redis_key_mapper_test.rb
@@ -1,105 +1,105 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class RedisKeyMapperTest < MiniTest::Unit::TestCase
+class RedisKeyMapperTest < Minitest::Test
   def test_output_of_liked_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Movie, 1), 'recommendable:users:1:liked_movies'
+    assert_equal 'recommendable:users:1:liked_movies', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Movie, 1)
   end
 
   def test_output_of_disliked_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Movie, 1), 'recommendable:users:1:disliked_movies'
+    assert_equal 'recommendable:users:1:disliked_movies', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Movie, 1)
   end
 
   def test_output_of_hidden_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Movie, 1), 'recommendable:users:1:hidden_movies'
+    assert_equal 'recommendable:users:1:hidden_movies', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Movie, 1)
   end
 
   def test_output_of_bookmarked_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Movie, 1), 'recommendable:users:1:bookmarked_movies'
+    assert_equal 'recommendable:users:1:bookmarked_movies', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Movie, 1)
   end
 
   def test_output_of_recommended_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Movie, 1), 'recommendable:users:1:recommended_movies'
+    assert_equal 'recommendable:users:1:recommended_movies', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Movie, 1)
   end
 
   def test_output_of_similarity_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.similarity_set_for(1), 'recommendable:users:1:similarities'
+    assert_equal 'recommendable:users:1:similarities', Recommendable::Helpers::RedisKeyMapper.similarity_set_for(1)
   end
 
   def test_output_of_liked_by_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Movie, 1), 'recommendable:movies:1:liked_by'
+    assert_equal 'recommendable:movies:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Movie, 1)
   end
 
   def test_output_of_disliked_by_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Movie, 1), 'recommendable:movies:1:disliked_by'
+    assert_equal 'recommendable:movies:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Movie, 1)
   end
 
   def test_output_of_score_set_for
-    assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Movie), 'recommendable:movies:scores'
+    assert_equal 'recommendable:movies:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Movie)
   end
 
   def test_output_of_liked_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Documentary, 1), 'recommendable:users:1:liked_movies'
+    assert_equal 'recommendable:users:1:liked_movies', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Documentary, 1)
   end
 
   def test_output_of_disliked_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Documentary, 1), 'recommendable:users:1:disliked_movies'
+    assert_equal 'recommendable:users:1:disliked_movies', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Documentary, 1)
   end
 
   def test_output_of_hidden_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Documentary, 1), 'recommendable:users:1:hidden_movies'
+    assert_equal 'recommendable:users:1:hidden_movies', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Documentary, 1)
   end
 
   def test_output_of_bookmarked_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Documentary, 1), 'recommendable:users:1:bookmarked_movies'
+    assert_equal 'recommendable:users:1:bookmarked_movies', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Documentary, 1)
   end
 
   def test_output_of_recommended_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Documentary, 1), 'recommendable:users:1:recommended_movies'
+    assert_equal 'recommendable:users:1:recommended_movies', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Documentary, 1)
   end
 
   def test_output_of_liked_by_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Documentary, 1), 'recommendable:movies:1:liked_by'
+    assert_equal 'recommendable:movies:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Documentary, 1)
   end
 
   def test_output_of_disliked_by_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Documentary, 1), 'recommendable:movies:1:disliked_by'
+    assert_equal 'recommendable:movies:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Documentary, 1)
   end
 
   def test_output_of_score_set_for_subclass_of_ratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Documentary), 'recommendable:movies:scores'
+    assert_equal 'recommendable:movies:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Documentary)
   end
 
   def test_output_of_liked_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Car, 1), 'recommendable:users:1:liked_cars'
+    assert_equal 'recommendable:users:1:liked_cars', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Car, 1)
   end
 
   def test_output_of_disliked_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Car, 1), 'recommendable:users:1:disliked_cars'
+    assert_equal 'recommendable:users:1:disliked_cars', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Car, 1)
   end
 
   def test_output_of_hidden_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Car, 1), 'recommendable:users:1:hidden_cars'
+    assert_equal 'recommendable:users:1:hidden_cars', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Car, 1)
   end
 
   def test_output_of_bookmarked_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Car, 1), 'recommendable:users:1:bookmarked_cars'
+    assert_equal 'recommendable:users:1:bookmarked_cars', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Car, 1)
   end
 
   def test_output_of_recommended_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Car, 1), 'recommendable:users:1:recommended_cars'
+    assert_equal 'recommendable:users:1:recommended_cars', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Car, 1)
   end
 
   def test_output_of_liked_by_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Car, 1), 'recommendable:cars:1:liked_by'
+    assert_equal 'recommendable:cars:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Car, 1)
   end
 
   def test_output_of_disliked_by_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Car, 1), 'recommendable:cars:1:disliked_by'
+    assert_equal 'recommendable:cars:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Car, 1)
   end
 
   def test_output_of_score_set_for_ratable_subclass_of_nonratable
-    assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Car), 'recommendable:cars:scores'
+    assert_equal 'recommendable:cars:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Car)
   end
 
 end
diff --git a/test/recommendable/ratable/dislikable_test.rb b/test/recommendable/ratable/dislikable_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class DislikableTest < MiniTest::Unit::TestCase
+class DislikableTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @friend = Factory(:user)

diff --git a/test/recommendable/ratable/likable_test.rb b/test/recommendable/ratable/likable_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class LikableTest < MiniTest::Unit::TestCase
+class LikableTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @friend = Factory(:user)

diff --git a/test/recommendable/ratable_test.rb b/test/recommendable/ratable_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class RatableTest < MiniTest::Unit::TestCase
+class RatableTest < Minitest::Test
   def setup
     @movie = Factory(:movie)
     @book = Factory(:book)

diff --git a/test/recommendable/rater/bookmarker_test.rb b/test/recommendable/rater/bookmarker_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class BookmarkerTest < MiniTest::Unit::TestCase
+class BookmarkerTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @movie = Factory(:movie)

diff --git a/test/recommendable/rater/disliker_test.rb b/test/recommendable/rater/disliker_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class DislikerTest < MiniTest::Unit::TestCase
+class DislikerTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @movie = Factory(:movie)

diff --git a/test/recommendable/rater/hider_test.rb b/test/recommendable/rater/hider_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class HiderTest < MiniTest::Unit::TestCase
+class HiderTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @movie = Factory(:movie)

diff --git a/test/recommendable/rater/liker_test.rb b/test/recommendable/rater/liker_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class LikerTest < MiniTest::Unit::TestCase
+class LikerTest < Minitest::Test
   def setup
     @user = Factory(:user)
     @movie = Factory(:movie)

diff --git a/test/recommendable/rater/recommender_test.rb b/test/recommendable/rater/recommender_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class RecommenderTest < MiniTest::Unit::TestCase
+class RecommenderTest < Minitest::Test
   def setup
     @user = Factory(:user)
     5.times  { |x| instance_variable_set(:"@user#{x+1}",  Factory(:user))  }

diff --git a/test/recommendable/rater_test.rb b/test/recommendable/rater_test.rb
@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
 require 'test_helper'
 
-class RaterTest < MiniTest::Unit::TestCase
+class RaterTest < Minitest::Test
   def setup
     @user = Factory(:user)
   end