dolt 0.25.0 → 0.26.0

data/test/dolt/sinatra/actions_test.rb

@@ -20,19 +20,22 @@ require "dolt/sinatra/actions"
 
 describe Dolt::Sinatra::Actions do
   describe "#blob" do
-    it "delegates to actions" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new)
-      app.blob("gitorious", "master", "app/models/repository.rb")
+    it "delegates to lookup" do
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
+
+      dolt.blob("gitorious", "master", "app/models/repository.rb")
 
-      assert_equal "gitorious", actions.repo
-      assert_equal "master", actions.ref
-      assert_equal "app/models/repository.rb", actions.path
+      assert_equal "gitorious", lookup.repo
+      assert_equal "master", lookup.ref
+      assert_equal "app/models/repository.rb", lookup.path
     end
 
     it "renders the blob template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.blob("gitorious", "master", "app/models/repository.rb")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.blob("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
@@ -40,15 +43,18 @@ describe Dolt::Sinatra::Actions do
 
     it "renders the blob template with custom data" do
       renderer = Test::Renderer.new("Blob")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
-      app.blob("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
+
+      dolt.blob("gitorious", "master", "app/models/repository.rb", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "redirects tree views to tree action" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.blob("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.blob("gitorious", "master", "app/models")
 
       assert_equal 302, app.response.status
       assert_equal "/gitorious/tree/master:app/models", app.response["Location"]
@@ -56,16 +62,19 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
-      app.blob("gitorious", "issue-%23221", "app/my documents")
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
+
+      dolt.blob("gitorious", "issue-%23221", "app/my documents")
 
-      assert_equal "issue-#221", actions.ref
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "does not redirect ref to oid by default" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.blob("gitorious", "master", "lib/gitorious.rb")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.blob("gitorious", "master", "lib/gitorious.rb")
 
       location = app.response["Location"]
       refute_equal 302, app.response.status
@@ -73,8 +82,10 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.blob("gitorious", "master", "lib/gitorious.rb")
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.blob("gitorious", "master", "lib/gitorious.rb")
 
       location = app.response["Location"]
       assert_equal 307, app.response.status
@@ -85,18 +96,21 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree" do
     it "delegates to actions" do
-      actions = Test::Actions.new(Stub::Tree.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new)
-      app.tree("gitorious", "master", "app/models")
+      lookup = Test::Lookup.new(Stub::Tree.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
+
+      dolt.tree("gitorious", "master", "app/models")
 
-      assert_equal "gitorious", actions.repo
-      assert_equal "master", actions.ref
-      assert_equal "app/models", actions.path
+      assert_equal "gitorious", lookup.repo
+      assert_equal "master", lookup.ref
+      assert_equal "app/models", lookup.path
     end
 
     it "renders the tree template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
@@ -104,15 +118,18 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Tree")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
-      app.tree("gitorious", "master", "app/models", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
+
+      dolt.tree("gitorious", "master", "app/models", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "redirects blob views to blob action" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "master", "app/models/repository.rb")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "master", "app/models/repository.rb")
 
       location = app.response["Location"]
       assert_equal 302, app.response.status
@@ -121,38 +138,47 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "sets X-UA-Compatible header" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "master", "app/models")
 
       assert_equal "IE=edge", app.response["X-UA-Compatible"]
     end
 
     it "does not set cache-control header for head ref" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "master", "app/models")
 
       assert !app.response.key?("Cache-Control")
     end
 
     it "sets cache headers for full oid ref" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "a" * 40, "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "a" * 40, "app/models")
 
       assert_equal "max-age=315360000, public", app.response["Cache-Control"]
       refute_nil app.response["Expires"]
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Tree.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
-      app.tree("gitorious", "issue-%23221", "app")
+      lookup = Test::Lookup.new(Stub::Tree.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
 
-      assert_equal "issue-#221", actions.ref
+      dolt.tree("gitorious", "issue-%23221", "app")
+
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree("gitorious", "master", "lib")
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree("gitorious", "master", "lib")
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/tree/#{'a' * 40}:lib", app.response["Location"]
@@ -161,8 +187,10 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree_entry" do
     it "renders trees with the tree template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree_entry("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree_entry("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "tree:Tree", app.body
@@ -170,31 +198,37 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Tree")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
-      app.tree_entry("gitorious", "master", "app/models", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
+
+      dolt.tree_entry("gitorious", "master", "app/models", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "renders trees with the tree template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.tree_entry("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.tree_entry("gitorious", "master", "app/models")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blob:Blob", app.body
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Tree.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
-      app.tree_entry("gitorious", "issue-%23221", "app")
+      lookup = Test::Lookup.new(Stub::Tree.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
+
+      dolt.tree_entry("gitorious", "issue-%23221", "app")
 
-      assert_equal "issue-#221", actions.ref
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree_entry("gitorious", "master", "lib")
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree_entry("gitorious", "master", "lib")
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/source/#{'a' * 40}:lib", app.response["Location"]
@@ -202,19 +236,22 @@ describe Dolt::Sinatra::Actions do
   end
 
   describe "#raw" do
-    it "delegates to actions" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new)
-      app.raw("gitorious", "master", "app/models/repository.rb")
+    it "delegates to lookup" do
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
 
-      assert_equal "gitorious", actions.repo
-      assert_equal "master", actions.ref
-      assert_equal "app/models/repository.rb", actions.path
+      dolt.raw("gitorious", "master", "app/models/repository.rb")
+
+      assert_equal "gitorious", lookup.repo
+      assert_equal "master", lookup.ref
+      assert_equal "app/models/repository.rb", lookup.path
     end
 
     it "renders the raw template as text" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
-      app.raw("gitorious", "master", "app/models/repository.rb")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
+
+      dolt.raw("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/plain", app.response["Content-Type"]
       assert_equal "raw:Text", app.body
@@ -222,15 +259,18 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Text")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
-      app.raw("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
+
+      dolt.raw("gitorious", "master", "app/models/repository.rb", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "redirects tree views to tree action" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.raw("gitorious", "master", "app/models")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.raw("gitorious", "master", "app/models")
 
       location = app.response["Location"]
       assert_equal 302, app.response.status
@@ -239,16 +279,19 @@ describe Dolt::Sinatra::Actions do
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
-      app.raw("gitorious", "issue-%23221", "app/models/repository.rb")
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
+
+      dolt.raw("gitorious", "issue-%23221", "app/models/repository.rb")
 
-      assert_equal "issue-#221", actions.ref
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.raw("gitorious", "master", "lib/gitorious.rb")
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.raw("gitorious", "master", "lib/gitorious.rb")
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/raw/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -256,19 +299,22 @@ describe Dolt::Sinatra::Actions do
   end
 
   describe "#blame" do
-    it "delegates to actions" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new)
-      app.blame("gitorious", "master", "app/models/repository.rb")
+    it "delegates to lookup" do
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
+
+      dolt.blame("gitorious", "master", "app/models/repository.rb")
 
-      assert_equal "gitorious", actions.repo
-      assert_equal "master", actions.ref
-      assert_equal "app/models/repository.rb", actions.path
+      assert_equal "gitorious", lookup.repo
+      assert_equal "master", lookup.ref
+      assert_equal "app/models/repository.rb", lookup.path
     end
 
     it "renders the blame template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
-      app.blame("gitorious", "master", "app/models/repository.rb")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
+
+      dolt.blame("gitorious", "master", "app/models/repository.rb")
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "blame:Text", app.body
@@ -276,23 +322,27 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Text")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
-      app.blame("gitorious", "master", "app/models/repository.rb", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
+
+      dolt.blame("gitorious", "master", "app/models/repository.rb", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
-      app.blame("gitorious", "issue-%23221", "app/models/repository.rb")
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
+
+      dolt.blame("gitorious", "issue-%23221", "app/models/repository.rb")
 
-      assert_equal "issue-#221", actions.ref
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.blame("gitorious", "master", "lib/gitorious.rb")
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.blame("gitorious", "master", "lib/gitorious.rb")
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/blame/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -300,19 +350,21 @@ describe Dolt::Sinatra::Actions do
   end
 
   describe "#history" do
-    it "delegates to actions" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new)
-      app.history("gitorious", "master", "app/models/repository.rb", 10)
+    it "delegates to lookup" do
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new)
+      dolt.history("gitorious", "master", "app/models/repository.rb", 10)
 
-      assert_equal "gitorious", actions.repo
-      assert_equal "master", actions.ref
-      assert_equal "app/models/repository.rb", actions.path
+      assert_equal "gitorious", lookup.repo
+      assert_equal "master", lookup.ref
+      assert_equal "app/models/repository.rb", lookup.path
     end
 
     it "renders the commits template as html" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Text"))
-      app.history("gitorious", "master", "app/models/repository.rb", 10)
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Text"))
+
+      dolt.history("gitorious", "master", "app/models/repository.rb", 10)
 
       assert_equal "text/html; charset=utf-8", app.response["Content-Type"]
       assert_equal "commits:Text", app.body
@@ -320,23 +372,27 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Text")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
-      app.history("gitorious", "master", "app/models/repository.rb", 10, { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
+
+      dolt.history("gitorious", "master", "app/models/repository.rb", 10, { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Blob.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Blob"))
-      app.history("gitorious", "issue-%23221", "lib/gitorious.rb", 10)
+      lookup = Test::Lookup.new(Stub::Blob.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Blob"))
 
-      assert_equal "issue-#221", actions.ref
+      dolt.history("gitorious", "issue-%23221", "lib/gitorious.rb", 10)
+
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("Blob"))
-      app.history("gitorious", "master", "lib/gitorious.rb", 10)
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("Blob"))
+
+      dolt.history("gitorious", "master", "lib/gitorious.rb", 10)
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/history/#{'a' * 40}:lib/gitorious.rb", app.response["Location"]
@@ -345,8 +401,10 @@ describe Dolt::Sinatra::Actions do
 
   describe "#refs" do
     it "renders the refs template as json" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), Test::Renderer.new("JSON"))
-      app.refs("gitorious")
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Blob.new), Test::Renderer.new("JSON"))
+
+      dolt.refs("gitorious")
 
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "refs:JSON", app.body
@@ -354,8 +412,9 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Text")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Blob.new), renderer)
-      app.refs("gitorious", { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Blob.new), renderer)
+
+      dolt.refs("gitorious", { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
@@ -363,8 +422,10 @@ describe Dolt::Sinatra::Actions do
 
   describe "#tree_history" do
     it "renders the tree_history template as json" do
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("JSON"))
-      app.tree_history("gitorious", "master", "", 1)
+      app = Test::App.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("JSON"))
+
+      dolt.tree_history("gitorious", "master", "", 1)
 
       assert_equal "application/json", app.response["Content-Type"]
       assert_equal "tree_history:JSON", app.body
@@ -372,23 +433,27 @@ describe Dolt::Sinatra::Actions do
 
     it "renders template with custom data" do
       renderer = Test::Renderer.new("Text")
-      app = Test::SinatraApp.new(Test::Actions.new(Stub::Tree.new), renderer)
-      app.tree_history("gitorious", "master", "app/models", 1, { :who => 42 })
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, Test::Lookup.new(Stub::Tree.new), renderer)
+
+      dolt.tree_history("gitorious", "master", "app/models", 1, { :who => 42 })
 
       assert_equal 42, renderer.data[:who]
     end
 
     it "unescapes ref" do
-      actions = Test::Actions.new(Stub::Tree.new)
-      app = Test::SinatraApp.new(actions, Test::Renderer.new("Tree"))
-      app.tree_history("gitorious", "issue-%23221", "app/models")
+      lookup = Test::Lookup.new(Stub::Tree.new)
+      dolt = Dolt::Sinatra::Actions.new(Test::App.new, lookup, Test::Renderer.new("Tree"))
 
-      assert_equal "issue-#221", actions.ref
+      dolt.tree_history("gitorious", "issue-%23221", "app/models")
+
+      assert_equal "issue-#221", lookup.ref
     end
 
     it "redirects ref to oid if configured so" do
-      app = Test::RedirectingSinatraApp.new(Test::Actions.new(Stub::Tree.new), Test::Renderer.new("Tree"))
-      app.tree_history("gitorious", "master", "lib", 10)
+      app = Test::RedirectingApp.new
+      dolt = Dolt::Sinatra::Actions.new(app, Test::Lookup.new(Stub::Tree.new), Test::Renderer.new("Tree"))
+
+      dolt.tree_history("gitorious", "master", "lib", 10)
 
       assert_equal 307, app.response.status
       assert_equal "/gitorious/tree_history/#{'a' * 40}:lib", app.response["Location"]