diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-02 15:06:54 -0500 |
commit | b677983475513c78108406901fccd5cbe9604ca6 (patch) | |
tree | f83b5e20930cbe1be890af41ea1d0c0d2ebf5e2e /spec/views/tournaments/new.html.erb_spec.rb | |
parent | 4e682a9a8596326a2d1faab6c44e5a54918c5ba0 (diff) | |
parent | 1bfc0513fa113f5b4a61e89d74e42dd78ece44e7 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Conflicts:
Gemfile.lock
app/views/layouts/application.html.erb
config/routes.rb
Diffstat (limited to 'spec/views/tournaments/new.html.erb_spec.rb')
-rw-r--r-- | spec/views/tournaments/new.html.erb_spec.rb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/spec/views/tournaments/new.html.erb_spec.rb b/spec/views/tournaments/new.html.erb_spec.rb deleted file mode 100644 index 49785a4..0000000 --- a/spec/views/tournaments/new.html.erb_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe "tournaments/new" do - before(:each) do - assign(:tournament, stub_model(Tournament, - :game => nil - ).as_new_record) - end - - it "renders new tournament form" do - render - - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "form[action=?][method=?]", tournaments_path, "post" do - assert_select "input#tournament_game[name=?]", "tournament[game]" - end - end -end |