mirror of
https://github.com/neocities/neocities.git
synced 2025-04-24 17:22:35 +02:00
Fix for tag test issues
This commit is contained in:
parent
cef1611003
commit
d3c4c5f340
4 changed files with 11 additions and 3 deletions
1
Gemfile
1
Gemfile
|
@ -88,6 +88,7 @@ group :test do
|
|||
gem 'webmock', require: nil
|
||||
gem 'stripe-ruby-mock', '2.0.1', require: 'stripe_mock'
|
||||
gem 'timecop'
|
||||
gem 'mock_redis'
|
||||
|
||||
platform :mri, :rbx do
|
||||
gem 'simplecov', require: nil
|
||||
|
|
|
@ -101,6 +101,7 @@ GEM
|
|||
ruby-progressbar
|
||||
mocha (1.1.0)
|
||||
metaclass (~> 0.0.1)
|
||||
mock_redis (0.16.1)
|
||||
msgpack (0.7.5)
|
||||
multi_json (1.11.2)
|
||||
net-scp (1.2.1)
|
||||
|
@ -260,6 +261,7 @@ DEPENDENCIES
|
|||
minitest
|
||||
minitest-reporters
|
||||
mocha
|
||||
mock_redis
|
||||
msgpack
|
||||
paypal-recurring
|
||||
pg
|
||||
|
@ -301,4 +303,4 @@ DEPENDENCIES
|
|||
zipruby
|
||||
|
||||
BUNDLED WITH
|
||||
1.11.2
|
||||
1.12.1
|
||||
|
|
|
@ -62,7 +62,12 @@ Sidekiq.configure_client do |config|
|
|||
config.redis = sidekiq_redis_config
|
||||
end
|
||||
|
||||
$redis = Redis.new
|
||||
if ENV['RACK_ENV'] == 'test'
|
||||
$redis = MockRedis.new
|
||||
else
|
||||
$redis = Redis.new
|
||||
end
|
||||
|
||||
$redis_cache = Redis::Namespace.new :cache, redis: $redis
|
||||
|
||||
# :nocov:
|
||||
|
|
|
@ -23,7 +23,7 @@ class Tag < Sequel::Model
|
|||
end
|
||||
|
||||
def self.popular_names(limit=10)
|
||||
cache = $redis_cache.get :tag_popular_names
|
||||
cache = $redis_cache['tag_popular_names']
|
||||
if cache.nil?
|
||||
res = DB["select tags.name,count(*) as c from sites_tags inner join tags on tags.id=sites_tags.tag_id where tags.name != '' and tags.is_nsfw='f' group by tags.name having count(*) > 1 order by c desc LIMIT ?", limit].all
|
||||
$redis_cache.set :tag_popular_names, res.to_msgpack
|
||||
|
|
Loading…
Add table
Reference in a new issue