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/pms | |
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/pms')
-rw-r--r-- | spec/views/pms/edit.html.erb_spec.rb | 22 | ||||
-rw-r--r-- | spec/views/pms/index.html.erb_spec.rb | 26 | ||||
-rw-r--r-- | spec/views/pms/new.html.erb_spec.rb | 22 | ||||
-rw-r--r-- | spec/views/pms/show.html.erb_spec.rb | 19 |
4 files changed, 0 insertions, 89 deletions
diff --git a/spec/views/pms/edit.html.erb_spec.rb b/spec/views/pms/edit.html.erb_spec.rb deleted file mode 100644 index 5ec0de5..0000000 --- a/spec/views/pms/edit.html.erb_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'spec_helper' - -describe "pms/edit" do - before(:each) do - @pm = assign(:pm, stub_model(Pm, - :author => nil, - :recipient => nil, - :message => "MyText" - )) - end - - it "renders the edit pm form" do - render - - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "form[action=?][method=?]", pm_path(@pm), "post" do - assert_select "input#pm_author[name=?]", "pm[author]" - assert_select "input#pm_recipient[name=?]", "pm[recipient]" - assert_select "textarea#pm_message[name=?]", "pm[message]" - end - end -end diff --git a/spec/views/pms/index.html.erb_spec.rb b/spec/views/pms/index.html.erb_spec.rb deleted file mode 100644 index a3bc733..0000000 --- a/spec/views/pms/index.html.erb_spec.rb +++ /dev/null @@ -1,26 +0,0 @@ -require 'spec_helper' - -describe "pms/index" do - before(:each) do - assign(:pms, [ - stub_model(Pm, - :author => nil, - :recipient => nil, - :message => "MyText" - ), - stub_model(Pm, - :author => nil, - :recipient => nil, - :message => "MyText" - ) - ]) - end - - it "renders a list of pms" 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 - assert_select "tr>td", :text => nil.to_s, :count => 2 - assert_select "tr>td", :text => "MyText".to_s, :count => 2 - end -end diff --git a/spec/views/pms/new.html.erb_spec.rb b/spec/views/pms/new.html.erb_spec.rb deleted file mode 100644 index 342af96..0000000 --- a/spec/views/pms/new.html.erb_spec.rb +++ /dev/null @@ -1,22 +0,0 @@ -require 'spec_helper' - -describe "pms/new" do - before(:each) do - assign(:pm, stub_model(Pm, - :author => nil, - :recipient => nil, - :message => "MyText" - ).as_new_record) - end - - it "renders new pm form" do - render - - # Run the generator again with the --webrat flag if you want to use webrat matchers - assert_select "form[action=?][method=?]", pms_path, "post" do - assert_select "input#pm_author[name=?]", "pm[author]" - assert_select "input#pm_recipient[name=?]", "pm[recipient]" - assert_select "textarea#pm_message[name=?]", "pm[message]" - end - end -end diff --git a/spec/views/pms/show.html.erb_spec.rb b/spec/views/pms/show.html.erb_spec.rb deleted file mode 100644 index 5802887..0000000 --- a/spec/views/pms/show.html.erb_spec.rb +++ /dev/null @@ -1,19 +0,0 @@ -require 'spec_helper' - -describe "pms/show" do - before(:each) do - @pm = assign(:pm, stub_model(Pm, - :author => nil, - :recipient => 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(//) - rendered.should match(/MyText/) - end -end |