Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lib/webrat/selenium/application_servers/rails.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,19 @@ def pid_file
end

def start_command
"mongrel_rails start -d --chdir='#{::Rails.root}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
if File.exists?(File.join(::Rails.root, 'script', 'rails'))
"cd #{::Rails.root} && ./script/rails server --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
else
"mongrel_rails start -d --chdir='#{::Rails.root}' --port=#{Webrat.configuration.application_port} --environment=#{Webrat.configuration.application_environment} --pid #{pid_file} &"
end
end

def stop_command
"mongrel_rails stop -c #{::Rails.root} --pid #{pid_file}"
if File.exists?(File.join(::Rails.root, 'script', 'rails'))
"kill `cat #{pid_file}`"
else
"mongrel_rails stop -c #{::Rails.root} --pid #{pid_file}"
end
end

end
Expand Down