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, 17 deletions

diff --git a/spec/views/alerts/show.html.erb_spec.rb b/spec/views/alerts/show.html.erb_spec.rb
deleted file mode 100644
index 267c9f1..0000000
--- a/spec/views/alerts/show.html.erb_spec.rb
+++ /dev/null
@@ -1,17 +0,0 @@
-require 'spec_helper'
-
-describe "alerts/show" do
-  before(:each) do
-    @alert = assign(:alert, stub_model(Alert,
-      :author => nil,
-      :message => "MyText"
-    ))
-  end
-
-  it "renders attributes in <p>" do
-    render
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    rendered.should match(//)
-    rendered.should match(/MyText/)
-  end
-end