zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 09:42:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixes for tests

Browse source
This commit is contained in:
Kyle Drake 2024-08-15 11:46:39 -05:00
parent 88f419ce67
commit 498f29bfa2
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/index.rb
View file

@ -1,8 +1,4 @@
get '/?' do get '/?' do
if params[:_ga_adgroupid]
session[:ga_adgroupid] = params[:_ga_adgroupid]
end
if current_site if current_site
require_login require_login
@ -32,7 +28,6 @@ get '/?' do
halt erb :'home', locals: {site: current_site} halt erb :'home', locals: {site: current_site}
end end
if SimpleCache.expired?(:index) if SimpleCache.expired?(:index)
@sites_count = Site.count.roundup(100) @sites_count = Site.count.roundup(100)
@total_hits_count = DB['SELECT SUM(hits) AS hits FROM SITES'].first[:hits] || 0 @total_hits_count = DB['SELECT SUM(hits) AS hits FROM SITES'].first[:hits] || 0
@ -52,7 +47,7 @@ get '/?' do
@create_disabled = false @create_disabled = false
@index_rendered = SimpleCache.store :index, erb(:index, layout: :index_layout), 1.hour @index_rendered = SimpleCache.store :index, erb(:index, layout: :index_layout), (ENV['RACK_ENV'] == 'test' ? -1 : 1.hour)
return @index_rendered return @index_rendered
else else

2
models/site.rb
View file

@ -111,7 +111,7 @@ class Site < Sequel::Model
COMMENTING_ALLOWED_UPDATED_COUNT = 2 COMMENTING_ALLOWED_UPDATED_COUNT = 2
SUGGESTIONS_LIMIT = 30 SUGGESTIONS_LIMIT = 30
SUGGESTIONS_VIEWS_MIN = 500 SUGGESTIONS_VIEWS_MIN = 10000
CHILD_SITES_MAX = 30 CHILD_SITES_MAX = 30
IP_CREATE_LIMIT = 1000 IP_CREATE_LIMIT = 1000

6
tests/site_tests.rb
View file

@ -112,7 +112,7 @@ describe Site do
describe 'suggestions' do describe 'suggestions' do
it 'should return suggestions for tags' do it 'should return suggestions for tags' do
site = Fabricate :site, new_tags_string: 'vegetables' site = Fabricate :site, new_tags_string: 'vegetables'
Site::SUGGESTIONS_LIMIT.times { Fabricate :site, new_tags_string: 'vegetables' } Site::SUGGESTIONS_LIMIT.times { Fabricate :site, new_tags_string: 'vegetables', site_changed: true }
_(site.suggestions.length).must_equal Site::SUGGESTIONS_LIMIT _(site.suggestions.length).must_equal Site::SUGGESTIONS_LIMIT
@ -122,10 +122,10 @@ describe Site do
site = Fabricate :site, new_tags_string: 'gardening' site = Fabricate :site, new_tags_string: 'gardening'
(Site::SUGGESTIONS_LIMIT-5).times { (Site::SUGGESTIONS_LIMIT-5).times {
Fabricate :site, new_tags_string: 'gardening', views: Site::SUGGESTIONS_VIEWS_MIN Fabricate :site, new_tags_string: 'gardening', views: Site::SUGGESTIONS_VIEWS_MIN, site_changed: true
} }
_(site.suggestions.length).must_equal(Site::SUGGESTIONS_LIMIT - 5) _(site.suggestions.length).must_equal(Site::SUGGESTIONS_LIMIT)
end end
end end