Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

ignore assets

Browse source 
fix runner so it works on mac
get rid of some test warnings
This commit is contained in:
Sam Saffron 2013-04-30 12:43:21 +10:00
parent fc56e51cc6
commit 94a578e4b2
5 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -20,6 +20,8 @@ dump.rdb
/cache /cache
/coverage/* /coverage/*
/public/assets/*
config/database.yml config/database.yml
config/redis.yml config/redis.yml
config/discourse.pill config/discourse.pill

7
lib/autospec/runner.rb
View file

@ -68,7 +68,8 @@ class Autospec::Runner
@signal.signal @signal.signal
end end
Process.wait Process.wait(@spork_pid)
puts "Spork has been terminated, exiting"
rescue => e rescue => e
puts e puts e
@ -84,7 +85,7 @@ class Autospec::Runner
sleep(0.001) sleep(0.001)
end end
end end
t.join t.join rescue nil
end end
def force_polling? def force_polling?
@ -293,7 +294,7 @@ class Autospec::Runner
sleep 1 sleep 1
end end
@spork_pid = Process.spawn("RAILS_ENV=test bundle exec spork") @spork_pid = Process.spawn({'RAILS_ENV' => 'test'}, "bundle exec spork")
write_pid_file(spork_pid_file, @spork_pid) write_pid_file(spork_pid_file, @spork_pid)
running = false running = false

3
lib/oneboxer.rb
View file

@ -10,6 +10,8 @@ Dir["#{Rails.root}/lib/oneboxer/*_onebox.rb"].each {|f|
module Oneboxer module Oneboxer
extend Oneboxer::Base extend Oneboxer::Base
# keep reloaders happy
unless defined? Oneboxer::Result
Result = Struct.new(:doc, :changed) do Result = Struct.new(:doc, :changed) do
def to_html def to_html
doc.to_html doc.to_html
@ -19,6 +21,7 @@ module Oneboxer
changed changed
end end
end end
end
Dir["#{Rails.root}/lib/oneboxer/*_onebox.rb"].sort.each do |f| Dir["#{Rails.root}/lib/oneboxer/*_onebox.rb"].sort.each do |f|
add_onebox "Oneboxer::#{Pathname.new(f).basename.to_s.gsub(/\.rb$/, '').classify}".constantize add_onebox "Oneboxer::#{Pathname.new(f).basename.to_s.gsub(/\.rb$/, '').classify}".constantize

3
lib/oneboxer/rottentomatoes_onebox.rb
View file

@ -3,10 +3,13 @@ require_dependency 'oneboxer/handlebars_onebox'
module Oneboxer module Oneboxer
class RottentomatoesOnebox < HandlebarsOnebox class RottentomatoesOnebox < HandlebarsOnebox
# keep reloaders happy
unless defined? SYNOPSIS_MAX_TEXT
SYNOPSIS_MAX_TEXT = 370 SYNOPSIS_MAX_TEXT = 370
ROTTEN_IMG = 'http://images.rottentomatoescdn.com/images/icons/rt.rotten.med.png' ROTTEN_IMG = 'http://images.rottentomatoescdn.com/images/icons/rt.rotten.med.png'
FRESH_IMG = 'http://images.rottentomatoescdn.com/images/icons/rt.fresh.med.png' FRESH_IMG = 'http://images.rottentomatoescdn.com/images/icons/rt.fresh.med.png'
POPCORN_IMG = 'http://images.rottentomatoescdn.com/images/icons/popcorn_27x31.png' POPCORN_IMG = 'http://images.rottentomatoescdn.com/images/icons/popcorn_27x31.png'
end
matcher /^http:\/\/(?:www\.)?rottentomatoes\.com(\/mobile)?\/m\/.*$/ matcher /^http:\/\/(?:www\.)?rottentomatoes\.com(\/mobile)?\/m\/.*$/
favicon 'rottentomatoes.png' favicon 'rottentomatoes.png'