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

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

4 files changed, 0 insertions, 57 deletions

diff --git a/spec/views/servers/edit.html.erb_spec.rb b/spec/views/servers/edit.html.erb_spec.rb
deleted file mode 100644
index 870126c..0000000
--- a/spec/views/servers/edit.html.erb_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "servers/edit" do
-  before(:each) do
-    @server = assign(:server, stub_model(Server))
-  end
-
-  it "renders the edit server form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", server_path(@server), "post" do
-    end
-  end
-end
diff --git a/spec/views/servers/index.html.erb_spec.rb b/spec/views/servers/index.html.erb_spec.rb
deleted file mode 100644
index 9af4a19..0000000
--- a/spec/views/servers/index.html.erb_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "servers/index" do
-  before(:each) do
-    assign(:servers, [
-      stub_model(Server),
-      stub_model(Server)
-    ])
-  end
-
-  it "renders a list of servers" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-  end
-end
diff --git a/spec/views/servers/new.html.erb_spec.rb b/spec/views/servers/new.html.erb_spec.rb
deleted file mode 100644
index bfc69c5..0000000
--- a/spec/views/servers/new.html.erb_spec.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-describe "servers/new" do
-  before(:each) do
-    assign(:server, stub_model(Server).as_new_record)
-  end
-
-  it "renders new server form" do
-    render
-
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", servers_path, "post" do
-    end
-  end
-end
diff --git a/spec/views/servers/show.html.erb_spec.rb b/spec/views/servers/show.html.erb_spec.rb
deleted file mode 100644
index 3762389..0000000
--- a/spec/views/servers/show.html.erb_spec.rb
+++ /dev/null
@@ -1,12 +0,0 @@
-require 'spec_helper'
-
-describe "servers/show" do
-  before(:each) do
-    @server = assign(:server, stub_model(Server))
-  end
-
-  it "renders attributes in <p>" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-  end
-end