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

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

7 files changed, 0 insertions, 245 deletions

diff --git a/spec/routing/alerts_routing_spec.rb b/spec/routing/alerts_routing_spec.rb
deleted file mode 100644
index 9485907..0000000
--- a/spec/routing/alerts_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe AlertsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/alerts").should route_to("alerts#index")
-    end
-
-    it "routes to #new" do
-      get("/alerts/new").should route_to("alerts#new")
-    end
-
-    it "routes to #show" do
-      get("/alerts/1").should route_to("alerts#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/alerts/1/edit").should route_to("alerts#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/alerts").should route_to("alerts#create")
-    end
-
-    it "routes to #update" do
-      put("/alerts/1").should route_to("alerts#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/alerts/1").should route_to("alerts#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/games_routing_spec.rb b/spec/routing/games_routing_spec.rb
deleted file mode 100644
index 3b3ec0c..0000000
--- a/spec/routing/games_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe GamesController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/games").should route_to("games#index")
-    end
-
-    it "routes to #new" do
-      get("/games/new").should route_to("games#new")
-    end
-
-    it "routes to #show" do
-      get("/games/1").should route_to("games#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/games/1/edit").should route_to("games#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/games").should route_to("games#create")
-    end
-
-    it "routes to #update" do
-      put("/games/1").should route_to("games#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/games/1").should route_to("games#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/matches_routing_spec.rb b/spec/routing/matches_routing_spec.rb
deleted file mode 100644
index a9f8254..0000000
--- a/spec/routing/matches_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe MatchesController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/matches").should route_to("matches#index")
-    end
-
-    it "routes to #new" do
-      get("/matches/new").should route_to("matches#new")
-    end
-
-    it "routes to #show" do
-      get("/matches/1").should route_to("matches#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/matches/1/edit").should route_to("matches#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/matches").should route_to("matches#create")
-    end
-
-    it "routes to #update" do
-      put("/matches/1").should route_to("matches#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/matches/1").should route_to("matches#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/pms_routing_spec.rb b/spec/routing/pms_routing_spec.rb
deleted file mode 100644
index 839b0a9..0000000
--- a/spec/routing/pms_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe PmsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/pms").should route_to("pms#index")
-    end
-
-    it "routes to #new" do
-      get("/pms/new").should route_to("pms#new")
-    end
-
-    it "routes to #show" do
-      get("/pms/1").should route_to("pms#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/pms/1/edit").should route_to("pms#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/pms").should route_to("pms#create")
-    end
-
-    it "routes to #update" do
-      put("/pms/1").should route_to("pms#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/pms/1").should route_to("pms#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/servers_routing_spec.rb b/spec/routing/servers_routing_spec.rb
deleted file mode 100644
index e514d15..0000000
--- a/spec/routing/servers_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe ServersController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/servers").should route_to("servers#index")
-    end
-
-    it "routes to #new" do
-      get("/servers/new").should route_to("servers#new")
-    end
-
-    it "routes to #show" do
-      get("/servers/1").should route_to("servers#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/servers/1/edit").should route_to("servers#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/servers").should route_to("servers#create")
-    end
-
-    it "routes to #update" do
-      put("/servers/1").should route_to("servers#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/servers/1").should route_to("servers#destroy", :id => "1")
-    end
-
-  end
-end
diff --git a/spec/routing/teams_routing_spec.rb b/spec/routing/teams_routing_spec.rb
deleted file mode 100644
index 818fa7b..0000000
--- a/spec/routing/teams_routing_spec.rb
+++ /dev/null
@@ -1,35 +0,0 @@
-require "spec_helper"
-
-describe TeamsController do
-  describe "routing" do
-
-    it "routes to #index" do
-      get("/teams").should route_to("teams#index")
-    end
-
-    it "routes to #new" do
-      get("/teams/new").should route_to("teams#new")
-    end
-
-    it "routes to #show" do
-      get("/teams/1").should route_to("teams#show", :id => "1")
-    end
-
-    it "routes to #edit" do
-      get("/teams/1/edit").should route_to("teams#edit", :id => "1")
-    end
-
-    it "routes to #create" do
-      post("/teams").should route_to("teams#create")
-    end
-
-    it "routes to #update" do
-      put("/teams/1").should route_to("teams#update", :id => "1")
-    end
-
-    it "routes to #destroy" do
-      delete("/teams/1").should route_to("teams#destroy", :id => "1")
-    end
-
-  end
-end
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