Skip to content

Commit df82439

Browse files
davidcelisdavidcelis
committed
Fix flapping tests
Signed-off-by: David Celis <[email protected]>
1 parent 76c0ddc commit df82439

File tree

15 files changed

+40
-38
lines changed

15 files changed

+40
-38
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ matrix:
4242
gemfile: gemfiles/rails_edge.gemfile
4343
- rvm: 2.1.0
4444
gemfile: gemfiles/rails_edge.gemfile
45-
- jruby-21mode
45+
- rvm: jruby-21mode
4646
gemfile: gemfiles/rails_edge.gemfile
4747
- rvm: 2.2.0
4848
gemfile: gemfiles/rails_31.gemfile

‎gemfiles/rails_edge.gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ source 'https://rubygems.org/'
22
gemspec :path => '../'
33

44
gem 'rails', github: 'rails/rails'
5+
gem 'arel', github: 'rails/arel'
56

67
gem 'sqlite3', :platform => :ruby
78
gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby

‎recommendable.gemspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ EOF
2424
s.add_dependency 'redis', '>= 2.2.0'
2525
s.add_dependency 'hooks', '>= 0.2.1'
2626

27-
s.add_development_dependency 'minitest', '>= 4.2'
27+
s.add_development_dependency 'minitest', '~> 4.2'
2828
s.add_development_dependency 'minifacture'
2929
s.add_development_dependency 'yard'
3030
s.add_development_dependency 'rails', '>= 3.1.0'

‎test/dummy/config/initializers/recommendable.rb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33

44
Recommendable.configure do |config|
55
config.redis = Redis.new(:host => 'localhost', :port => 6379, :db => 15)
6+
config.user_class = User
67
end

‎test/recommendable/helpers/calculations_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class CalculationsTest < MiniTest::Unit::TestCase
4+
class CalculationsTest < Minitest::Test
55
def setup
66
@user = Factory(:user)
77
5.times { |x| instance_variable_set(:"@user#{x+1}", Factory(:user)) }

‎test/recommendable/helpers/redis_key_mapper_test.rb‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class RedisKeyMapperTest < MiniTest::Unit::TestCase
4+
class RedisKeyMapperTest < Minitest::Test
55
def test_output_of_liked_set_for
6-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Movie, 1), 'recommendable:users:1:liked_movies'
6+
assert_equal 'recommendable:users:1:liked_movies', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Movie, 1)
77
end
88

99
def test_output_of_disliked_set_for
10-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Movie, 1), 'recommendable:users:1:disliked_movies'
10+
assert_equal 'recommendable:users:1:disliked_movies', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Movie, 1)
1111
end
1212

1313
def test_output_of_hidden_set_for
14-
assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Movie, 1), 'recommendable:users:1:hidden_movies'
14+
assert_equal 'recommendable:users:1:hidden_movies', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Movie, 1)
1515
end
1616

1717
def test_output_of_bookmarked_set_for
18-
assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Movie, 1), 'recommendable:users:1:bookmarked_movies'
18+
assert_equal 'recommendable:users:1:bookmarked_movies', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Movie, 1)
1919
end
2020

2121
def test_output_of_recommended_set_for
22-
assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Movie, 1), 'recommendable:users:1:recommended_movies'
22+
assert_equal 'recommendable:users:1:recommended_movies', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Movie, 1)
2323
end
2424

2525
def test_output_of_similarity_set_for
26-
assert_equal Recommendable::Helpers::RedisKeyMapper.similarity_set_for(1), 'recommendable:users:1:similarities'
26+
assert_equal 'recommendable:users:1:similarities', Recommendable::Helpers::RedisKeyMapper.similarity_set_for(1)
2727
end
2828

2929
def test_output_of_liked_by_set_for
30-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Movie, 1), 'recommendable:movies:1:liked_by'
30+
assert_equal 'recommendable:movies:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Movie, 1)
3131
end
3232

3333
def test_output_of_disliked_by_set_for
34-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Movie, 1), 'recommendable:movies:1:disliked_by'
34+
assert_equal 'recommendable:movies:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Movie, 1)
3535
end
3636

3737
def test_output_of_score_set_for
38-
assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Movie), 'recommendable:movies:scores'
38+
assert_equal 'recommendable:movies:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Movie)
3939
end
4040

4141
def test_output_of_liked_set_for_subclass_of_ratable
42-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Documentary, 1), 'recommendable:users:1:liked_movies'
42+
assert_equal 'recommendable:users:1:liked_movies', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Documentary, 1)
4343
end
4444

4545
def test_output_of_disliked_set_for_subclass_of_ratable
46-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Documentary, 1), 'recommendable:users:1:disliked_movies'
46+
assert_equal 'recommendable:users:1:disliked_movies', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Documentary, 1)
4747
end
4848

4949
def test_output_of_hidden_set_for_subclass_of_ratable
50-
assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Documentary, 1), 'recommendable:users:1:hidden_movies'
50+
assert_equal 'recommendable:users:1:hidden_movies', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Documentary, 1)
5151
end
5252

5353
def test_output_of_bookmarked_set_for_subclass_of_ratable
54-
assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Documentary, 1), 'recommendable:users:1:bookmarked_movies'
54+
assert_equal 'recommendable:users:1:bookmarked_movies', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Documentary, 1)
5555
end
5656

5757
def test_output_of_recommended_set_for_subclass_of_ratable
58-
assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Documentary, 1), 'recommendable:users:1:recommended_movies'
58+
assert_equal 'recommendable:users:1:recommended_movies', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Documentary, 1)
5959
end
6060

6161
def test_output_of_liked_by_set_for_subclass_of_ratable
62-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Documentary, 1), 'recommendable:movies:1:liked_by'
62+
assert_equal 'recommendable:movies:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Documentary, 1)
6363
end
6464

6565
def test_output_of_disliked_by_set_for_subclass_of_ratable
66-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Documentary, 1), 'recommendable:movies:1:disliked_by'
66+
assert_equal 'recommendable:movies:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Documentary, 1)
6767
end
6868

6969
def test_output_of_score_set_for_subclass_of_ratable
70-
assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Documentary), 'recommendable:movies:scores'
70+
assert_equal 'recommendable:movies:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Documentary)
7171
end
7272

7373
def test_output_of_liked_set_for_ratable_subclass_of_nonratable
74-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_set_for(Car, 1), 'recommendable:users:1:liked_cars'
74+
assert_equal 'recommendable:users:1:liked_cars', Recommendable::Helpers::RedisKeyMapper.liked_set_for(Car, 1)
7575
end
7676

7777
def test_output_of_disliked_set_for_ratable_subclass_of_nonratable
78-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Car, 1), 'recommendable:users:1:disliked_cars'
78+
assert_equal 'recommendable:users:1:disliked_cars', Recommendable::Helpers::RedisKeyMapper.disliked_set_for(Car, 1)
7979
end
8080

8181
def test_output_of_hidden_set_for_ratable_subclass_of_nonratable
82-
assert_equal Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Car, 1), 'recommendable:users:1:hidden_cars'
82+
assert_equal 'recommendable:users:1:hidden_cars', Recommendable::Helpers::RedisKeyMapper.hidden_set_for(Car, 1)
8383
end
8484

8585
def test_output_of_bookmarked_set_for_ratable_subclass_of_nonratable
86-
assert_equal Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Car, 1), 'recommendable:users:1:bookmarked_cars'
86+
assert_equal 'recommendable:users:1:bookmarked_cars', Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(Car, 1)
8787
end
8888

8989
def test_output_of_recommended_set_for_ratable_subclass_of_nonratable
90-
assert_equal Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Car, 1), 'recommendable:users:1:recommended_cars'
90+
assert_equal 'recommendable:users:1:recommended_cars', Recommendable::Helpers::RedisKeyMapper.recommended_set_for(Car, 1)
9191
end
9292

9393
def test_output_of_liked_by_set_for_ratable_subclass_of_nonratable
94-
assert_equal Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Car, 1), 'recommendable:cars:1:liked_by'
94+
assert_equal 'recommendable:cars:1:liked_by', Recommendable::Helpers::RedisKeyMapper.liked_by_set_for(Car, 1)
9595
end
9696

9797
def test_output_of_disliked_by_set_for_ratable_subclass_of_nonratable
98-
assert_equal Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Car, 1), 'recommendable:cars:1:disliked_by'
98+
assert_equal 'recommendable:cars:1:disliked_by', Recommendable::Helpers::RedisKeyMapper.disliked_by_set_for(Car, 1)
9999
end
100100

101101
def test_output_of_score_set_for_ratable_subclass_of_nonratable
102-
assert_equal Recommendable::Helpers::RedisKeyMapper.score_set_for(Car), 'recommendable:cars:scores'
102+
assert_equal 'recommendable:cars:scores', Recommendable::Helpers::RedisKeyMapper.score_set_for(Car)
103103
end
104104

105105
end

‎test/recommendable/ratable/dislikable_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class DislikableTest < MiniTest::Unit::TestCase
4+
class DislikableTest < Minitest::Test
55
def setup
66
@user = Factory(:user)
77
@friend = Factory(:user)

‎test/recommendable/ratable/likable_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class LikableTest < MiniTest::Unit::TestCase
4+
class LikableTest < Minitest::Test
55
def setup
66
@user = Factory(:user)
77
@friend = Factory(:user)

‎test/recommendable/ratable_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class RatableTest < MiniTest::Unit::TestCase
4+
class RatableTest < Minitest::Test
55
def setup
66
@movie = Factory(:movie)
77
@book = Factory(:book)

‎test/recommendable/rater/bookmarker_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
$LOAD_PATH.unshift File.expand_path('../../test', __FILE__)
22
require 'test_helper'
33

4-
class BookmarkerTest < MiniTest::Unit::TestCase
4+
class BookmarkerTest < Minitest::Test
55
def setup
66
@user = Factory(:user)
77
@movie = Factory(:movie)

0 commit comments

Comments
 (0)