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/matches | |
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/matches')
-rw-r--r-- | spec/views/matches/edit.html.erb_spec.rb | 18 | ||||
-rw-r--r-- | spec/views/matches/index.html.erb_spec.rb | 20 | ||||
-rw-r--r-- | spec/views/matches/new.html.erb_spec.rb | 18 | ||||
-rw-r--r-- | spec/views/matches/show.html.erb_spec.rb | 15 |
4 files changed, 0 insertions, 71 deletions
diff --git a/spec/views/matches/edit.html.erb_spec.rb b/spec/views/matches/edit.html.erb_spec.rb deleted file mode 100644 index 0f7c673..0000000 --- a/spec/views/matches/edit.html.erb_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe "matches/edit" do - before(:each) do - @match = assign(:match, stub_model(Match, - :tournament => nil - )) - end - - it "renders the edit match form" do - render - - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "form[action=?][method=?]", match_path(@match), "post" do - assert_select "input#match_tournament[name=?]", "match[tournament]" - end - end -end diff --git a/spec/views/matches/index.html.erb_spec.rb b/spec/views/matches/index.html.erb_spec.rb deleted file mode 100644 index e920f16..0000000 --- a/spec/views/matches/index.html.erb_spec.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'spec_helper' - -describe "matches/index" do - before(:each) do - assign(:matches, [ - stub_model(Match, - :tournament => nil - ), - stub_model(Match, - :tournament => nil - ) - ]) - end - - it "renders a list of matches" do - render - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "tr>td", :text => nil.to_s, :count => 2 - end -end diff --git a/spec/views/matches/new.html.erb_spec.rb b/spec/views/matches/new.html.erb_spec.rb deleted file mode 100644 index c3537dc..0000000 --- a/spec/views/matches/new.html.erb_spec.rb +++ /dev/null @@ -1,18 +0,0 @@ -require 'spec_helper' - -describe "matches/new" do - before(:each) do - assign(:match, stub_model(Match, - :tournament => nil - ).as_new_record) - end - - it "renders new match form" do - render - - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "form[action=?][method=?]", matches_path, "post" do - assert_select "input#match_tournament[name=?]", "match[tournament]" - end - end -end diff --git a/spec/views/matches/show.html.erb_spec.rb b/spec/views/matches/show.html.erb_spec.rb deleted file mode 100644 index 4460feb..0000000 --- a/spec/views/matches/show.html.erb_spec.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'spec_helper' - -describe "matches/show" do - before(:each) do - @match = assign(:match, stub_model(Match, - :tournament => nil - )) - 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(//) - end -end |