@@ -51,7 +51,7 @@ namespace :test do desc "Install all gems on which the tests depend on" task :install_dependencies do - system 'gem install redgreen rr mocha ruby-debug dm-sweatshop' + system 'gem install redgreen rr mocha ruby-debug dm-sweatshop webrat' system 'gem install -s http://gems.github.com jeremymcanally-context jeremymcanally-matchy jeremymcanally-pending foca-storyteller' end end @@ -89,7 +89,7 @@ begin s.executables = ['integrity'] s.post_install_message = 'Run `integrity help` for information on how to setup Integrity.' - s.add_dependency 'sinatra', ['>= 0.3.2'] + s.add_dependency 'sinatra', ['>= 0.9.0.3'] s.add_dependency 'haml' # ah, you evil monkey you s.add_dependency 'dm-core', ['>= 0.9.5'] s.add_dependency 'dm-validations', ['>= 0.9.5'] Rakefile @@ -1,7 +1,6 @@ require File.dirname(__FILE__) + "/lib/integrity" require "sinatra" require "helpers" -require "hacks" set :root, Integrity.root set :public, Integrity.root / "public" @@ -46,7 +45,7 @@ end get "/login" do login_required session[:user] = current_user - redirect "/" + redirect root_url end get "/new" do @@ -62,7 +61,7 @@ post "/" do @project = Project.new(params[:project_data]) if @project.save @project.enable_notifiers(params["enabled_notifiers[]"], params["notifiers"]) - redirect project_path(@project) + redirect project_url(@project) else show :new, :title => ["projects", "new project"] end @@ -75,7 +74,7 @@ end get "/:project.atom" do login_required unless current_project.public? - header "Content-Type" => "application/atom+xml; charset=utf-8" + response["Content-Type"] = "application/rss+xml; charset=utf-8" builder :project end @@ -83,7 +82,7 @@ put "/:project" do login_required if current_project.update_attributes(params[:project_data]) - current_project.enable_notifiers(params["enabled_notifiers[]"], params["notifiers"]) + current_project.enable_notifiers(params["enabled_notifiers"], params["notifiers"]) redirect project_url(current_project) else show :new, :title => ["projects", current_project.permalink, "edit"] @@ -94,7 +93,7 @@ delete "/:project" do login_required current_project.destroy - redirect "/" + redirect root_url end get "/:project/edit" do @@ -129,7 +128,7 @@ get "/:project/builds/:build" do end get "/integrity.css" do - header "Content-Type" => "text/css; charset=utf-8" + response["Content-Type"] = "text/css; charset=utf-8" sass :integrity end app.rb @@ -25,7 +25,7 @@ module Integrity end def unauthorized!(realm=authorization_realm) - header "WWW-Authenticate" => %(Basic realm="#{realm}") + response["WWW-Authenticate"] = %(Basic realm="#{realm}") throw :halt, [401, show(:unauthorized, :title => "incorrect credentials")] end end lib/integrity/helpers/authorization.rb @@ -1,8 +1,20 @@ module Integrity module Helpers module Urls - def integrity_domain - Addressable::URI.parse(Integrity.config[:base_uri]).to_s + def url(path) + url = "#{request.scheme}://#{request.host}" + + if request.scheme == "https" && request.port != 443 || + request.scheme == "http" && request.port != 80 + url << ":#{request.port}" + end + + url << "/" unless path.index("/").zero? + url << path + end + + def root_url + url("/") end def project_path(project, *path) @@ -10,14 +22,14 @@ module Integrity end def project_url(project, *path) - "#{integrity_domain}#{project_path(project, *path)}" + url project_path(project, *path) end def push_url_for(project) - Addressable::URI.parse("#{project_url(project)}/push").tap do |url| + Addressable::URI.parse(project_url(project, "push")).tap do |url| if Integrity.config[:use_basic_auth] url.user = Integrity.config[:admin_username] - url.password = Integrity.config[:hash_admin_password] ? + url.password = Integrity.config[:hash_admin_password] ? "<password>" : Integrity.config[:admin_password] end end.to_s @@ -28,7 +40,7 @@ module Integrity end def build_url(build) - "#{integrity_domain}#{build_path(build)}" + url build_path(build) end end end lib/integrity/helpers/urls.rb @@ -33,7 +33,7 @@ class ApiTest < Test::Unit::AcceptanceTestCase end end - Project.gen(:my_test_project, :uri => repo.path) + Project.gen(:my_test_project, :uri => repo.path, :command => "echo successful") lambda do basic_auth "admin", "test" @@ -71,7 +71,7 @@ class ApiTest < Test::Unit::AcceptanceTestCase Project.gen(:my_test_project, :uri => git_repo(:my_test_project).path) head = git_repo(:my_test_project).head post "/my-test-project/push", :payload => payload(head, "master") - + response_code.should == 401 end test/acceptance/api_test.rb @@ -7,27 +7,23 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase I want to setup notifiers on my projects So that I get alerts with every build EOS - - before(:each) do - Integrity.config[:base_uri] = "http://integrity.example.org" - end scenario "an admin sets up a notifier for a project that didn't have any" do git_repo(:my_test_project).add_successful_commit Project.gen(:my_test_project, :notifiers => [], :uri => git_repo(:my_test_project).path) rm_f "/tmp/textfile_notifications.txt" - + login_as "admin", "test" - + visit "/my-test-project" click_link "Edit Project" check "enabled_notifiers_textfile" fill_in "File", :with => "/tmp/textfile_notifications.txt" click_button "Update Project" - + click_button "manual build" - + notification = File.read("/tmp/textfile_notifications.txt") notification.should =~ /=== Build #{git_repo(:my_test_project).short_head} was successful ===/ notification.should =~ /Build #{git_repo(:my_test_project).head} was successful/ @@ -37,4 +33,4 @@ class BuildNotificationsTest < Test::Unit::AcceptanceTestCase notification.should =~ /Commit Message: This commit will work/ notification.should =~ /Build Output:\n\nRunning tests...\n/ end -end \ No newline at end of file +end test/acceptance/build_notifications_test.rb @@ -1,9 +1,61 @@ -require "webrat/sinatra" +require 'webrat/rack' +require 'sinatra' +require 'sinatra/test' + +disable :run +disable :reload + +Webrat.configuration.instance_variable_set("@mode", :sinatra) + +module Webrat + class SinatraSession < Session + DEFAULT_DOMAIN = "integrity.example.org" + + def initialize(context = nil) + super(context) + @sinatra_test = Sinatra::TestHarness.new + end + + %w(get head post put delete).each do |verb| + class_eval <<-METHOD + def #{verb}(path, data, headers = {}) + params = data.inject({}) do |data, (key,value)| + data[key] = Rack::Utils.unescape(value) + data + end + headers['HTTP_HOST'] = DEFAULT_DOMAIN + @sinatra_test.#{verb}(path, params, headers) + end + METHOD + end + + def response_body + @sinatra_test.body + end + + def response_code + @sinatra_test.status + end + + private + + def response + @sinatra_test.response + end + + def current_host + URI.parse(current_url).host || DEFAULT_DOMAIN + end + + def response_location_host + URI.parse(response_location).host || DEFAULT_DOMAIN + end + end +end + require Integrity.root / "app" require File.dirname(__FILE__) / "acceptance/git_helper" -Webrat.configuration.mode = :sinatra - module AcceptanceHelper include FileUtils @@ -17,14 +69,14 @@ module AcceptanceHelper Integrity.config[:admin_password] = "test" Integrity.config[:hash_admin_password] = false end - + def login_as(user, password) def AcceptanceHelper.logged_in; true; end basic_auth user, password visit "/login" - Sinatra.application.before { login_required if AcceptanceHelper.logged_in } + Sinatra::Application.before { login_required if AcceptanceHelper.logged_in } end - + def log_out def AcceptanceHelper.logged_in; false; end @_webrat_session = Webrat::SinatraSession.new(self) @@ -47,17 +99,17 @@ module AcceptanceHelper end end -module WebratHelpers - include Webrat::Methods - Webrat::Methods.delegate_to_session :response_code, :response_body -end - class Test::Unit::AcceptanceTestCase < Test::Unit::TestCase include AcceptanceHelper include Test::Storyteller - include WebratHelpers include GitHelper - + include Webrat::Methods + Webrat::Methods.delegate_to_session :response_code + + before(:all) do + Integrity.config[:base_uri] = "http://#{Webrat::SinatraSession::DEFAULT_DOMAIN}" + end + before(:each) do # ensure each scenario is run in a clean sandbox setup_and_reset_database! @@ -66,7 +118,7 @@ class Test::Unit::AcceptanceTestCase < Test::Unit::TestCase set_and_create_export_directory! log_out end - + after(:each) do destroy_all_git_repos rm_r export_directory if File.directory?(export_directory) test/helpers/acceptance.rb @@ -28,7 +28,8 @@ class BrowsePublicProjectsTest < Test::Unit::TestCase @project = Project.gen(:integrity) Integrity.config[:admin_username] = "admin" Integrity.config[:admin_password] = "test" - Integrity.config[:base_uri] = "http://integrity.example.org:1234" + + stub(self).request { OpenStruct.new(:scheme => "http", :port => "1234", :host => "integrity.example.org") } end test "with auth disabled" do test/unit/helpers_test.rb @@ -1 +1 @@ -Subproject commit 78b8f3411ad83bea91e7bf98dcb8e9f640e75603 +Subproject commit 0272e818473d12b1d9bd45beed55b54e3e4418a3 vendor/webrat vendor/sinatra-hacks/lib/hacks.rb 674bee8f925ce174b6e7fbbf13982080513c960e e0c6c5cd3b6cf18f941ab4b9e40825197d3bf684 Nicolas Sanguinetti contacto@nicolassanguinetti.info http://github.com/foca/integrity/commit/a3b778400630ee7beb37981a56b6de5f980978d9 a3b778400630ee7beb37981a56b6de5f980978d9 2009-01-25T14:15:40-08:00 2009-01-25T14:15:40-08:00 Merge branch 'sinatra-0.9' ee4006e0b2b85def3b812a123d12aa93565a0c93 Nicolas Sanguinetti contacto@nicolassanguinetti.info