foca-integrity 0.1.9.1 → 0.1.9.2

data/test/acceptance/notifier_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class NotifierConfigIssues < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/project_syndication_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class ProjectSyndicationTest < Test::Unit::AcceptanceTestCase
   story <<-EOS

data/test/acceptance/stylesheet_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/helpers"
+require File.dirname(__FILE__) + "/../helpers/acceptance"
 
 class IntegrityStylesheetTest < Test::Unit::AcceptanceTestCase
   story <<-EOS
@@ -8,11 +8,19 @@ class IntegrityStylesheetTest < Test::Unit::AcceptanceTestCase
   EOS
 
   scenario "browsing on some Integrity install" do
+    visit "/"
+    assert_have_tag("link[@href='/integrity.css']")
     visit "/integrity.css"
 
     assert_contain("body {")
-    # TODO: better test
+    # TODO: Check that it actually returns a 302
     assert_equal %Q{"2465c472aacf302259dde5146a841e45"},
       webrat_session.send(:response).headers["ETag"]
+
+    visit "/reset.css"
+    assert_contain("Yahoo!")
+
+    visit "/buttons.css"
+    assert_contain("button {")
   end
 end

data/test/acceptance/unauthorized_page_test.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + "/../helpers/acceptance"
+
+class UnauthorizedPageTest < Test::Unit::AcceptanceTestCase
+  story <<-EOS
+    As an administrator,
+    I want to be shown a friendly login error page
+    So that I don't feel guilty of loosing my password
+  EOS
+
+  scenario "an administrator (who's amnesiac) tries to login" do
+    project = Project.gen(:public => false)
+
+    visit "/#{project.name}/edit"
+    assert_equal 401, response_code
+
+    # TODO click_link "try again"
+    assert_have_tag("a[@href='/login']", :content => "try again")
+    assert_have_tag("a[@href='/']",      :content => "go back")
+  end
+end

data/test/helpers.rb

@@ -1,5 +1,4 @@
-$:.unshift File.dirname(__FILE__) + "/../lib", File.dirname(__FILE__),
-  File.dirname(__FILE__) + "/../vendor/webrat/lib"
+$:.unshift File.dirname(__FILE__) + "/../lib", File.dirname(__FILE__)
 
 %w(test/unit
 context
@@ -9,19 +8,18 @@ storyteller
 webrat/sinatra
 rr
 mocha
-test/zentest_assertions
 dm-sweatshop).each { |dependency|
   begin
     require dependency
-  rescue LoadError
+  rescue LoadError => e
     puts "You're missing some gems required to run the tests."
-    puts "Please run `rake test:install_dependencies`"
-    puts "You'll probably need to run that command as root or with sudo."
+    puts "Please run `rake test:setup`"
+    puts "NOTE: You'll probably need to run that command as root or with sudo."
 
     puts "Thanks :)"
     puts
 
-    exit 1
+    raise
   end
 }
 
@@ -39,6 +37,21 @@ module TestHelper
   def ignore_logs!
     Integrity.config[:log] = "/tmp/integrity.test.log"
   end
+
+  def capture_stdout
+    output = StringIO.new
+    $stdout = output
+    yield
+    $stdout = STDOUT
+    output
+  end
+
+  def silence_warnings
+    $VERBOSE, v = nil, $VERBOSE
+    yield
+  ensure
+    $VERBOSE = v
+  end
 end
 
 class Test::Unit::TestCase

data/test/helpers/acceptance.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + "/../helpers"
 require "helpers/acceptance/git_helper"
 
 module AcceptanceHelper

data/test/unit/build_test.rb

@@ -36,6 +36,18 @@ class BuildTest < Test::Unit::TestCase
       @build.successful = false
       @build.status.should be(:failed)
     end
+
+    test "deprecated properties" do
+      silence_warnings {
+        @build.short_commit_identifier.should == @build.commit.short_identifier
+        @build.commit_identifier.should == @build.commit.identifier
+        @build.commit_author.should     == @build.commit.author
+        @build.commit_message.should    == @build.commit.message
+        @build.commited_at.should       == @build.commit.committed_at
+        @build.project_id.should        == @build.commit.project_id
+        @build.should respond_to(:commit_metadata)
+      }
+    end
   end
 
   describe "Pending builds" do
@@ -48,4 +60,25 @@ class BuildTest < Test::Unit::TestCase
       Build.should have(3).pending
     end
   end
+
+  describe "Queueing a build" do
+    before(:each) do
+      @commit = Commit.gen
+      stub.instance_of(ProjectBuilder).build(@commit)
+    end
+
+    it "creates an empty Build" do
+      @commit.build.should be_nil
+      Build.queue(@commit)
+      @commit.build.should_not be_nil
+    end
+
+    it "ensures the build is saved" do
+      @commit.build.should be_nil
+      Build.queue(@commit)
+
+      commit = Commit.first(:identifier => @commit.identifier)
+      commit.build.should_not be_nil
+    end
+  end
 end

data/test/unit/commit_test.rb

@@ -59,25 +59,4 @@ class CommitTest < Test::Unit::TestCase
       commit.human_readable_status.should be("658ba96 hasn't been built yet")
     end
   end
-
-  describe "Queueing a build" do
-    before(:each) do
-      @commit = Commit.gen
-      stub.instance_of(ProjectBuilder).build(@commit)
-    end
-
-    it "creates an empty Build" do
-      @commit.build.should be_nil
-      @commit.queue_build
-      @commit.build.should_not be_nil
-    end
-
-    it "ensures the build is saved" do
-      @commit.build.should be_nil
-      @commit.queue_build
-
-      commit = Commit.first(:identifier => @commit.identifier)
-      commit.build.should_not be_nil
-    end
-  end
 end

data/test/unit/helpers_test.rb

@@ -1,25 +1,72 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class BrowsePublicProjectsTest < Test::Unit::TestCase
-  include ::Integrity::Helpers
+  setup do
+    @h = Module.new { extend Integrity::Helpers }
+  end
 
   test "#pretty_date" do
-    pretty_date(Time.now).should == "today"
-    pretty_date(Time.new - 86400).should == "yesterday"
+    @h.pretty_date(Time.now).should == "today"
+    @h.pretty_date(Time.new - 86400).should == "yesterday"
 
-    pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 01st"
-    pretty_date(Time.mktime(1995, 12, 21)).should == "on Dec 21st"
-    pretty_date(Time.mktime(1995, 12, 31)).should == "on Dec 31st"
+    @h.pretty_date(Time.mktime(1995, 12, 01)).should == "on Dec 01st"
+    @h.pretty_date(Time.mktime(1995, 12, 21)).should == "on Dec 21st"
+    @h.pretty_date(Time.mktime(1995, 12, 31)).should == "on Dec 31st"
 
-    pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
-    pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
+    @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
+    @h.pretty_date(Time.mktime(1995, 12, 22)).should == "on Dec 22nd"
 
-    pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 03rd"
-    pretty_date(Time.mktime(1995, 12, 23)).should == "on Dec 23rd"
+    @h.pretty_date(Time.mktime(1995, 12, 03)).should == "on Dec 03rd"
+    @h.pretty_date(Time.mktime(1995, 12, 23)).should == "on Dec 23rd"
 
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
-    pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+    @h.pretty_date(Time.mktime(1995, 12, 15)).should == "on Dec 15th"
+  end
+
+  describe "urls" do
+    before do
+      Integrity.config[:base_uri] = "http://example.org/ci"
+
+      @project = Project.gen(:name => "Foo Bar")
+      @build   = Build.gen(:successful)
+      @commit  = @build.commit
+    end
+
+    test "root" do
+      assert_equal "http://example.org/ci", @h.root_url.to_s
+      assert_equal "/ci", @h.root_path
+      assert_equal "/ci/stylesheet.css", @h.root_path("/stylesheet.css")
+
+      Integrity.config[:base_uri] = nil
+      @h.instance_variable_set(:@url, nil)
+      lambda { @h.root_url }.should raise_error
+
+      stub(@h).request { OpenStruct.new(:url => "http://0.0.0.0/") }
+      assert_equal "http://0.0.0.0/", @h.root_url.to_s
+    end
+
+    test "project" do
+      assert_equal "/ci/foo-bar", @h.project_path(@project)
+      assert_equal "http://example.org/ci/foo-bar",
+        @h.project_url(@project).to_s
+    end
+
+    test "commit" do
+      silence_warnings {
+        assert_equal "/ci/foo-bar/commits/#{@commit.identifier}",
+          @h.commit_path(@build.commit)
+        assert_equal "http://example.org/ci/foo-bar/commits/#{@commit.identifier}",
+          @h.commit_url(@build.commit).to_s
+      }
+    end
+
+    test "compat" do
+      silence_warnings {
+        assert_equal @h.build_path(@build), @h.commit_path(@build.commit)
+        assert_equal @h.build_url(@build),  @h.commit_url(@build.commit)
+      }
+    end
   end
 
   describe "#push_url_for" do
@@ -27,30 +74,30 @@ class BrowsePublicProjectsTest < Test::Unit::TestCase
       @project = Project.gen(:integrity)
       Integrity.config[:admin_username] = "admin"
       Integrity.config[:admin_password] = "test"
-
-      stub(self).request {
-        OpenStruct.new(:url => "http://integrity.example.org:1234")
-      }
+      Integrity.config[:base_uri] = "http://integrity.example.org:1234"
     end
 
     test "with auth disabled" do
       Integrity.config[:use_basic_auth] = false
 
-      push_url_for(@project).should == "http://integrity.example.org:1234/integrity/push"
+      assert_equal "http://integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
 
     test "with auth and hashing enabled" do
       Integrity.config[:use_basic_auth]      = true
       Integrity.config[:hash_admin_password] = true
 
-      push_url_for(@project).should == "http://admin:<password>@integrity.example.org:1234/integrity/push"
+      assert_equal "http://admin:<password>@integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
 
     test "with auth enabled and hashing disabled" do
       Integrity.config[:use_basic_auth]      = true
       Integrity.config[:hash_admin_password] = false
 
-      push_url_for(@project).should == "http://admin:test@integrity.example.org:1234/integrity/push"
+      assert_equal "http://admin:test@integrity.example.org:1234/integrity/push",
+        @h.push_url_for(@project)
     end
   end
 end

data/test/unit/integrity_test.rb

@@ -1,14 +1,31 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class IntegrityTest < Test::Unit::TestCase
-  test "Integrity.new loads configuration from a file" do
-    stub(DataMapper).setup { nil }
+  describe "#new" do
+    setup do
+      stub(DataMapper).setup { nil }
+      @config_file = File.dirname(__FILE__) + "/../../config/config.sample.yml"
+    end
 
-    file = File.dirname(__FILE__) + "/../../config/config.sample.yml"
-    Integrity.new(file)
+    it "doesn't require any argument" do
+      Integrity.new
 
-    Integrity.config[:base_uri].should == "http://integrity.domain.tld"
-    Integrity.config[:export_directory].should == "/path/to/scm/exports"
+      assert_equal Integrity.default_configuration[:log],
+        Integrity.config[:log]
+    end
+
+    it "loads configuration from a file" do
+      Integrity.new(@config_file)
+
+      assert_equal "http://integrity.domain.tld", Integrity.config[:base_uri]
+      assert_equal "/path/to/scm/exports",        Integrity.config[:export_directory]
+    end
+
+    it "takes configuration as an hash" do
+      Integrity.new(:base_uri => "http://foo.org")
+
+      assert_equal "http://foo.org", Integrity.config[:base_uri]
+    end
   end
 
   specify "config is just a hash" do

data/test/unit/migrations_test.rb

@@ -28,7 +28,7 @@ class MigrationsTest < Test::Unit::TestCase
   end
 
   test "upgrading a pre migration database" do
-    util_capture { Integrity.migrate_db }
+    capture_stdout { Integrity.migrate_db }
 
     current_migrations.should == ["initial", "add_commits"]
     assert table_exists?("integrity_projects")
@@ -40,7 +40,7 @@ class MigrationsTest < Test::Unit::TestCase
   test "migrating data from initial to add_commits migration" do
     load_initial_migration_fixture
 
-    util_capture { Integrity.migrate_db }
+    capture_stdout { Integrity.migrate_db }
     current_migrations.should == ["initial", "add_commits"]
 
     sinatra = Project.first(:name => "Sinatra")

data/test/unit/notifier_test.rb

@@ -1,6 +1,11 @@
 require File.dirname(__FILE__) + "/../helpers"
 
 class NotifierTest < Test::Unit::TestCase
+  test "deprecated methods" do
+    Notifier::Base.new(Build.gen, {}).should respond_to(:build)
+    Notifier::Base.new(Build.gen, {}).should respond_to(:build_url)
+  end
+
   specify "IRC fixture is valid and can be saved" do
     lambda do
       Notifier.generate(:irc).tap do |project|

data/test/unit/project_builder_test.rb

@@ -52,7 +52,6 @@ class ProjectBuilderTest < Test::Unit::TestCase
       }.should raise_error
     end
 
-
     it "sets the build status to failure when the build command exits with a non-zero status" do
       @project.update_attributes(:command => "exit 1")
       SCM::Git.any_instance.expects(:with_revision).with(@commit.identifier).yields
@@ -94,6 +93,14 @@ class ProjectBuilderTest < Test::Unit::TestCase
       @project.update_attributes(:uri => "scm://example.org")
       lambda { ProjectBuilder.new(@project) }.should raise_error(SCM::SCMUnknownError)
     end
+
+    it "doesn't fail if the commit identifier can't be retrieved" do
+      SCM::Git.any_instance.expects(:with_revision).with(@commit.identifier).yields
+      SCM::Git.any_instance.expects(:info).returns(false)
+      lambda {
+        ProjectBuilder.new(@project).build(@commit)
+      }.should_not raise_error
+    end
   end
 
   describe "When deleting the code from disk" do

data/test/unit/project_test.rb

@@ -110,6 +110,13 @@ class ProjectTest < Test::Unit::TestCase
       project = Project.gen(:commits => commits)
       project.last_commit.should == commits.sort_by {|c| c.committed_at }.last
     end
+
+    test "deprecated properties" do
+      silence_warnings {
+        @project.last_build.should      == @project.last_commit
+        @project.previous_builds.should == @project.previous_commits
+      }
+    end
   end
 
   describe "Validation" do

data/views/home.haml

@@ -4,7 +4,7 @@
     %h1
       Why don't you
       = succeed "?" do
-        %a{ :href => "/new" } create your first project
+        %a{ :href => root_path("/new") } create your first project
 - else
   %ul#projects
     - @projects.each do |project|
@@ -18,4 +18,4 @@
           - else
             = project.human_readable_status
   %p#new
-    %a{ :href => "/new" } Add a new project
+    %a{ :href => root_path("/new") } Add a new project

data/views/layout.haml

@@ -4,11 +4,12 @@
     %meta{ :content => "text/html; charset=utf-8", :"http-equiv" => "Content-Type" }
     %meta{ :content => "en", :"http-equiv" => "Content-Language" }
     %title= "#{@title.last} | integrity"
-    %link{ :media => "screen", :type => "text/css", :href => "/reset.css", :rel => "stylesheet" }
-    %link{ :media => "screen", :type => "text/css", :href => "/buttons.css", :rel => "stylesheet" }
-    %link{ :media => "screen", :type => "text/css", :href => "/integrity.css", :rel => "stylesheet" }
+    - stylesheets(:reset, :buttons, :integrity)
     - unless @project.nil?
-      %link{ :rel => "alternate", :type => "application/atom+xml", :title => "Build history Atom", :href => "#{project_path(@project)}.atom"}
+      %link{ :rel  => "alternate",                   |
+        :type   => "application/atom+xml",           |
+        :title  => "Build history Atom",             |
+        :href   => "#{project_path(@project)}.atom"} |
 
   %body
     #header
@@ -24,5 +25,5 @@
           %strong&= current_user
         - else
           Hey there!
-          %a{ :href => "/login" } Log In
+          %a{ :href => root_path("/login") } Log In
           if you have a user