Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb

1 files changed, 0 insertions, 35 deletions

diff --git a/spec/routing/tournaments_routing_spec.rb b/spec/routing/tournaments_routing_spec.rb
deleted file mode 100644
index e4a229c..0000000
--- a/spec/routing/tournaments_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe TournamentsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/tournaments").should route_to("tournaments#index")
-    end
-
-    it "routes to #new" do
-      get("/tournaments/new").should route_to("tournaments#new")
-    end
-
-    it "routes to #show" do
-      get("/tournaments/1").should route_to("tournaments#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/tournaments/1/edit").should route_to("tournaments#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/tournaments").should route_to("tournaments#create")
-    end
-
-    it "routes to #update" do
-      put("/tournaments/1").should route_to("tournaments#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/tournaments/1").should route_to("tournaments#destroy", :id => "1")
-    end
-
-  end
-end