diff options
Diffstat (limited to 'spec/views')
39 files changed, 128 insertions, 128 deletions
diff --git a/spec/views/companies/edit.html.erb_spec.rb b/spec/views/companies/edit.html.erb_spec.rb index 0f7bde351..871efac10 100644 --- a/spec/views/companies/edit.html.erb_spec.rb +++ b/spec/views/companies/edit.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/companies/edit" do +describe "/companies/edit", :type => :view do assign_referential let!(:company) { assign(:company, create(:company)) } let!(:companies) { Array.new(2) { create(:company) } } @@ -8,14 +8,14 @@ describe "/companies/edit" do describe "test" do it "should render h2 with the company name" do render - rendered.should have_selector("h2", :text => Regexp.new(company.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(company.name)) end end describe "form" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][name='company[name]'][value=?]", company.name end end diff --git a/spec/views/companies/index.html.erb_spec.rb b/spec/views/companies/index.html.erb_spec.rb index 686e8ab69..bf8ff5a38 100644 --- a/spec/views/companies/index.html.erb_spec.rb +++ b/spec/views/companies/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/companies/index" do +describe "/companies/index", :type => :view do assign_referential let!(:companies) { assign :companies, Array.new(2) { create(:company) }.paginate } @@ -9,13 +9,13 @@ describe "/companies/index" do it "should render a show link for each group" do render companies.each do |company| - rendered.should have_selector(".company a[href='#{view.referential_company_path(referential, company)}']", :text => company.name) + expect(rendered).to have_selector(".company a[href='#{view.referential_company_path(referential, company)}']", :text => company.name) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_company_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_company_path(referential)}']") end end diff --git a/spec/views/companies/new.html.erb_spec.rb b/spec/views/companies/new.html.erb_spec.rb index 86f252cbd..427cd21ac 100644 --- a/spec/views/companies/new.html.erb_spec.rb +++ b/spec/views/companies/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/companies/new" do +describe "/companies/new", :type => :view do assign_referential let!(:company) { assign(:company, build(:company)) } @@ -8,7 +8,7 @@ describe "/companies/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", company.name end end diff --git a/spec/views/companies/show.html.erb_spec.rb b/spec/views/companies/show.html.erb_spec.rb index eea95a406..f15fb3cd0 100644 --- a/spec/views/companies/show.html.erb_spec.rb +++ b/spec/views/companies/show.html.erb_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' -describe "/companies/show" do +describe "/companies/show", :type => :view do assign_referential let!(:company) { assign(:company, create(:company)) } it "should render h2 with the company name" do render - rendered.should have_selector("h2", :text => Regexp.new(company.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(company.name)) end # it "should display a map with class 'company'" do @@ -17,12 +17,12 @@ describe "/companies/show" do it "should render a link to edit the company" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_company_path(referential, company)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_company_path(referential, company)}']") end it "should render a link to remove the company" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_company_path(referential, company)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_company_path(referential, company)}'][class='remove']") end end diff --git a/spec/views/connection_links/edit.html.erb_spec.rb b/spec/views/connection_links/edit.html.erb_spec.rb index 4294cd6c0..963375454 100644 --- a/spec/views/connection_links/edit.html.erb_spec.rb +++ b/spec/views/connection_links/edit.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/connection_links/edit" do +describe "/connection_links/edit", :type => :view do assign_referential let!(:connection_link) { assign(:connection_link, create(:connection_link)) } let!(:connection_links) { Array.new(2) { create(:connection_link) } } @@ -8,14 +8,14 @@ describe "/connection_links/edit" do describe "test" do it "should render h2 with the connection_link name" do render - rendered.should have_selector("h2", :text => Regexp.new(connection_link.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name)) end end describe "form" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][name='connection_link[name]'][value=?]", connection_link.name end end diff --git a/spec/views/connection_links/index.html.erb_spec.rb b/spec/views/connection_links/index.html.erb_spec.rb index 39671bdc1..51029a2f8 100644 --- a/spec/views/connection_links/index.html.erb_spec.rb +++ b/spec/views/connection_links/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/connection_links/index" do +describe "/connection_links/index", :type => :view do assign_referential let!(:connection_links) { assign :connection_links, Array.new(2) { create(:connection_link) }.paginate } @@ -9,13 +9,13 @@ describe "/connection_links/index" do it "should render a show link for each group" do render connection_links.each do |connection_link| - rendered.should have_selector(".connection_link a[href='#{view.referential_connection_link_path(referential, connection_link)}']", :text => connection_link.name) + expect(rendered).to have_selector(".connection_link a[href='#{view.referential_connection_link_path(referential, connection_link)}']", :text => connection_link.name) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_connection_link_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_connection_link_path(referential)}']") end end diff --git a/spec/views/connection_links/new.html.erb_spec.rb b/spec/views/connection_links/new.html.erb_spec.rb index c914fccbf..8d17bbe8b 100644 --- a/spec/views/connection_links/new.html.erb_spec.rb +++ b/spec/views/connection_links/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/connection_links/new" do +describe "/connection_links/new", :type => :view do assign_referential let!(:connection_link) { assign(:connection_link, build(:connection_link)) } @@ -8,7 +8,7 @@ describe "/connection_links/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", connection_link.name end end diff --git a/spec/views/connection_links/show.html.erb_spec.rb b/spec/views/connection_links/show.html.erb_spec.rb index 433ebc227..7be74ad7c 100644 --- a/spec/views/connection_links/show.html.erb_spec.rb +++ b/spec/views/connection_links/show.html.erb_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' -describe "/connection_links/show" do +describe "/connection_links/show", :type => :view do assign_referential let!(:connection_link) { assign(:connection_link, create(:connection_link)) } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } it "should render h2 with the connection_link name" do render - rendered.should have_selector("h2", :text => Regexp.new(connection_link.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(connection_link.name)) end # it "should display a map with class 'connection_link'" do @@ -19,12 +19,12 @@ describe "/connection_links/show" do it "should render a link to edit the connection_link" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_connection_link_path(referential, connection_link)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_connection_link_path(referential, connection_link)}']") end it "should render a link to remove the connection_link" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_connection_link_path(referential, connection_link)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_connection_link_path(referential, connection_link)}'][class='remove']") end end diff --git a/spec/views/exports/index.html.erb_spec.rb b/spec/views/exports/index.html.erb_spec.rb index 781b5787b..c465f519d 100644 --- a/spec/views/exports/index.html.erb_spec.rb +++ b/spec/views/exports/index.html.erb_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -describe "exports/index.html.erb" do +describe "exports/index.html.erb", :type => :view do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/views/exports/new.html.erb_spec.rb b/spec/views/exports/new.html.erb_spec.rb index d4a3b255a..ff34aaf79 100644 --- a/spec/views/exports/new.html.erb_spec.rb +++ b/spec/views/exports/new.html.erb_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -describe "exports/new.html.erb" do +describe "exports/new.html.erb", :type => :view do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/views/import_tasks/index.html.erb_spec.rb b/spec/views/import_tasks/index.html.erb_spec.rb index c0f2d3462..db70e046c 100644 --- a/spec/views/import_tasks/index.html.erb_spec.rb +++ b/spec/views/import_tasks/index.html.erb_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -describe "imports/index.html.erb" do +describe "imports/index.html.erb", :type => :view do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/views/import_tasks/new.html.erb_spec.rb b/spec/views/import_tasks/new.html.erb_spec.rb index 002832dc9..007b0dc5e 100644 --- a/spec/views/import_tasks/new.html.erb_spec.rb +++ b/spec/views/import_tasks/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "import_tasks/new.html.erb" do +describe "import_tasks/new.html.erb", :type => :view do assign_referential let!(:import_task) { assign(:import_task, ImportTask.new) } @@ -9,7 +9,7 @@ describe "import_tasks/new.html.erb" do it "should display a radio button to choose import type" do render - rendered.should have_selector("input", :type => "select", :name => "import_task[format]") + expect(rendered).to have_selector("input", :type => "select", :name => "import_task[format]") end end diff --git a/spec/views/layouts/application.html.erb_spec.rb b/spec/views/layouts/application.html.erb_spec.rb index 616812e62..700084922 100644 --- a/spec/views/layouts/application.html.erb_spec.rb +++ b/spec/views/layouts/application.html.erb_spec.rb @@ -1,9 +1,9 @@ require 'spec_helper' -describe "/layouts/application" do +describe "/layouts/application", :type => :view do before(:each) do - view.stub :user_signed_in? => true + allow(view).to receive_messages :user_signed_in? => true end context "when Referential is a new record" do diff --git a/spec/views/lines/edit.html.erb_spec.rb b/spec/views/lines/edit.html.erb_spec.rb index 9d733e600..08f7a547b 100644 --- a/spec/views/lines/edit.html.erb_spec.rb +++ b/spec/views/lines/edit.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/lines/edit" do +describe "/lines/edit", :type => :view do assign_referential let!(:network) { create(:network) } let!(:company) { create(:company) } @@ -10,14 +10,14 @@ describe "/lines/edit" do describe "test" do it "should render h2 with the group name" do render - rendered.should have_selector("h2", :text => Regexp.new(line.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(line.name)) end end describe "form" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][name='line[name]'][value=?]", line.name end end @@ -25,7 +25,7 @@ describe "/lines/edit" do it "should render a checkbox for each line" do render lines.each do |line| - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type='checkbox'][value=?]", line.id end end diff --git a/spec/views/lines/index.html.erb_spec.rb b/spec/views/lines/index.html.erb_spec.rb index 2870e6b18..83b981a5a 100644 --- a/spec/views/lines/index.html.erb_spec.rb +++ b/spec/views/lines/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/lines/index" do +describe "/lines/index", :type => :view do assign_referential let!(:network) { create :network } @@ -9,19 +9,19 @@ describe "/lines/index" do let!(:q) { assign :q, Ransack::Search.new(Chouette::Line) } before :each do - view.stub(:link_with_search).and_return("#") + allow(view).to receive(:link_with_search).and_return("#") end it "should render a show link for each group" do render lines.each do |line| - rendered.should have_selector(".line a[href='#{view.referential_line_path(referential, line)}']", :text => line.name) + expect(rendered).to have_selector(".line a[href='#{view.referential_line_path(referential, line)}']", :text => line.name) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_line_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_line_path(referential)}']") end end diff --git a/spec/views/lines/new.html.erb_spec.rb b/spec/views/lines/new.html.erb_spec.rb index cd436ffcf..f0321fd64 100644 --- a/spec/views/lines/new.html.erb_spec.rb +++ b/spec/views/lines/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/lines/new" do +describe "/lines/new", :type => :view do assign_referential let!(:network) { create(:network) } let!(:company) { create(:company) } @@ -10,7 +10,7 @@ describe "/lines/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", line.name end end diff --git a/spec/views/lines/show.html.erb_spec.rb b/spec/views/lines/show.html.erb_spec.rb index 5ef414c01..8ff4357ac 100644 --- a/spec/views/lines/show.html.erb_spec.rb +++ b/spec/views/lines/show.html.erb_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' -describe "/lines/show" do +describe "/lines/show", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } let!(:routes) { assign :routes, Array.new(2) { create(:route, :line => line) }.paginate } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } it "should render h2 with the line name" do render - rendered.should have_selector("h2", :text => Regexp.new(line.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(line.name)) end # it "should display a map with class 'line'" do @@ -19,12 +19,12 @@ describe "/lines/show" do it "should render a link to edit the line" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_line_path(referential, line)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_line_path(referential, line)}']") end it "should render a link to remove the line" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_line_path(referential, line)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_line_path(referential, line)}'][class='remove']") end end diff --git a/spec/views/networks/edit.html.erb_spec.rb b/spec/views/networks/edit.html.erb_spec.rb index 2dab39089..2a18e09b6 100644 --- a/spec/views/networks/edit.html.erb_spec.rb +++ b/spec/views/networks/edit.html.erb_spec.rb @@ -1,20 +1,20 @@ require 'spec_helper' -describe "/networks/edit" do +describe "/networks/edit", :type => :view do assign_referential let!(:network) { assign(:network, create(:network) ) } describe "test" do it "should render h2 with the group name" do render - rendered.should have_selector("h2", :text => Regexp.new(network.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(network.name)) end end describe "form" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][name='network[name]'][value=?]", network.name end end diff --git a/spec/views/networks/index.html.erb_spec.rb b/spec/views/networks/index.html.erb_spec.rb index 7e0c24fa5..d78ef7c95 100644 --- a/spec/views/networks/index.html.erb_spec.rb +++ b/spec/views/networks/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/networks/index" do +describe "/networks/index", :type => :view do assign_referential let!(:networks) { assign :networks, Array.new(2){ create(:network) }.paginate } @@ -9,13 +9,13 @@ describe "/networks/index" do it "should render a show link for each group" do render networks.each do |network| - rendered.should have_selector(".network a[href='#{view.referential_network_path(referential, network)}']", :text => network.name) + expect(rendered).to have_selector(".network a[href='#{view.referential_network_path(referential, network)}']", :text => network.name) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_network_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_network_path(referential)}']") end end diff --git a/spec/views/networks/new.html.erb_spec.rb b/spec/views/networks/new.html.erb_spec.rb index 8299fdb0d..0e9c08372 100644 --- a/spec/views/networks/new.html.erb_spec.rb +++ b/spec/views/networks/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/networks/new" do +describe "/networks/new", :type => :view do assign_referential let!(:network) { assign(:network, build(:network)) } @@ -8,7 +8,7 @@ describe "/networks/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", network.name end end diff --git a/spec/views/networks/show.html.erb_spec.rb b/spec/views/networks/show.html.erb_spec.rb index a3aab1d9e..29efacb17 100644 --- a/spec/views/networks/show.html.erb_spec.rb +++ b/spec/views/networks/show.html.erb_spec.rb @@ -1,29 +1,29 @@ require 'spec_helper' -describe "/networks/show" do +describe "/networks/show", :type => :view do assign_referential let!(:network) { assign(:network, create(:network)) } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } it "should render h2 with the network name" do render - rendered.should have_selector("h2", :text => Regexp.new(network.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(network.name)) end it "should display a map with class 'network'" do render - rendered.should have_selector("#map") + expect(rendered).to have_selector("#map") end it "should render a link to edit the network" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_network_path(referential, network)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_network_path(referential, network)}']") end it "should render a link to remove the network" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_network_path(referential, network)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_network_path(referential, network)}'][class='remove']") end end diff --git a/spec/views/referentials/edit.html.erb_spec.rb b/spec/views/referentials/edit.html.erb_spec.rb index 3c2fbc5c3..a3978210b 100644 --- a/spec/views/referentials/edit.html.erb_spec.rb +++ b/spec/views/referentials/edit.html.erb_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -describe "referentials/edit.html.erb" do +describe "referentials/edit.html.erb", :type => :view do pending "add some examples to (or delete) #{__FILE__}" end diff --git a/spec/views/referentials/new.html.erb_spec.rb b/spec/views/referentials/new.html.erb_spec.rb index 05766ad50..dfc8fe6d5 100644 --- a/spec/views/referentials/new.html.erb_spec.rb +++ b/spec/views/referentials/new.html.erb_spec.rb @@ -1,17 +1,17 @@ require 'spec_helper' -describe "referentials/new.html.erb" do +describe "referentials/new.html.erb", :type => :view do assign_referential it "should have a textfield for name" do render - rendered.should have_selector("input", :name => "referential[name]") + expect(rendered).to have_selector("input", :name => "referential[name]") end it "should have a textfield for slug" do render - rendered.should have_selector("input", :name => "referential[slug]") + expect(rendered).to have_selector("input", :name => "referential[slug]") end end diff --git a/spec/views/referentials/show.html.erb_spec.rb b/spec/views/referentials/show.html.erb_spec.rb index e7f5427c2..1ea888c31 100644 --- a/spec/views/referentials/show.html.erb_spec.rb +++ b/spec/views/referentials/show.html.erb_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' -describe "referentials/show.html.erb" do +describe "referentials/show.html.erb", :type => :view do assign_referential it "should have a title with name" do render - rendered.should have_selector("h2", :text => Regexp.new(referential.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(referential.name)) end end diff --git a/spec/views/routes/show.html.erb_spec.rb b/spec/views/routes/show.html.erb_spec.rb index 983b63fcb..090624fbf 100644 --- a/spec/views/routes/show.html.erb_spec.rb +++ b/spec/views/routes/show.html.erb_spec.rb @@ -1,16 +1,16 @@ require 'spec_helper' -describe "/routes/show" do +describe "/routes/show", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } let!(:route) { assign :route, create(:route, :line => line) } let!(:stop_points) { assign :stop_points, Array.new(2) { create(:stop_point) }.paginate } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } it "should render h2 with the route name" do render - rendered.should have_selector("h2", :text => Regexp.new(line.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(line.name)) end # it "should display a map with class 'line'" do @@ -20,12 +20,12 @@ describe "/routes/show" do it "should render a link to edit the route" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_line_route_path(referential, line, route)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_line_route_path(referential, line, route)}']") end it "should render a link to remove the route" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_line_route_path(referential, line, route)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_line_route_path(referential, line, route)}'][class='remove']") end end diff --git a/spec/views/rule_parameter_sets/index.html.erb_spec.rb b/spec/views/rule_parameter_sets/index.html.erb_spec.rb index 0f50ea387..7d2206394 100644 --- a/spec/views/rule_parameter_sets/index.html.erb_spec.rb +++ b/spec/views/rule_parameter_sets/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/rule_parameter_sets/index" do +describe "/rule_parameter_sets/index", :type => :view do assign_referential let!(:rule_parameter_sets) { assign :rule_parameter_sets, [ Factory(:rule_parameter_set), @@ -9,13 +9,13 @@ describe "/rule_parameter_sets/index" do it "should render a show link for each rule_parameter_set" do render rule_parameter_sets.each do |rule_parameter_set| - rendered.should have_selector(".rule_parameter_set a[href='#{view.referential_rule_parameter_set_path(referential, rule_parameter_set)}']", :text => rule_parameter_set.name) + expect(rendered).to have_selector(".rule_parameter_set a[href='#{view.referential_rule_parameter_set_path(referential, rule_parameter_set)}']", :text => rule_parameter_set.name) end end it "should render a link to create a new rule_parameter_set" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_rule_parameter_set_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_rule_parameter_set_path(referential)}']") end end diff --git a/spec/views/rule_parameter_sets/new.html.erb_spec.rb b/spec/views/rule_parameter_sets/new.html.erb_spec.rb index 4670ecceb..66e8a72bf 100644 --- a/spec/views/rule_parameter_sets/new.html.erb_spec.rb +++ b/spec/views/rule_parameter_sets/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/rule_parameter_sets/new" do +describe "/rule_parameter_sets/new", :type => :view do assign_referential let!(:rule_parameter_set) { assign :rule_parameter_set, build( :rule_parameter_set, :referential => referential) } @@ -9,13 +9,13 @@ describe "/rule_parameter_sets/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", rule_parameter_set.name end end it "should render input div for added_mode_parameter_set" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "#added_mode_parameter_set" end end diff --git a/spec/views/stop_areas/edit.html.erb_spec.rb b/spec/views/stop_areas/edit.html.erb_spec.rb index 5d3dac112..6d1572551 100644 --- a/spec/views/stop_areas/edit.html.erb_spec.rb +++ b/spec/views/stop_areas/edit.html.erb_spec.rb @@ -1,21 +1,21 @@ require 'spec_helper' -describe "/stop_areas/edit" do +describe "/stop_areas/edit", :type => :view do assign_referential let!(:stop_area) { assign(:stop_area, create(:stop_area)) } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } describe "test" do it "should render h2 with the group name" do render - rendered.should have_selector("h2", :text => Regexp.new(stop_area.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(stop_area.name)) end end describe "form" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][name='stop_area[name]'][value=?]", stop_area.name end end diff --git a/spec/views/stop_areas/index.html.erb_spec.rb b/spec/views/stop_areas/index.html.erb_spec.rb index d758304a2..005a5145e 100644 --- a/spec/views/stop_areas/index.html.erb_spec.rb +++ b/spec/views/stop_areas/index.html.erb_spec.rb @@ -1,25 +1,25 @@ require 'spec_helper' -describe "/stop_areas/index" do +describe "/stop_areas/index", :type => :view do assign_referential let!(:stop_areas) { assign :stop_areas, Array.new(2) { create(:stop_area) }.paginate } let!(:q) { assign :q, Ransack::Search.new(Chouette::StopArea) } before :each do - view.stub(:link_with_search).and_return("#") + allow(view).to receive(:link_with_search).and_return("#") end it "should render a show link for each group" do render stop_areas.each do |stop_area| - rendered.should have_selector(".stop_area a[href='#{view.referential_stop_area_path(referential, stop_area)}']", :text => stop_area.name) + expect(rendered).to have_selector(".stop_area a[href='#{view.referential_stop_area_path(referential, stop_area)}']", :text => stop_area.name) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_stop_area_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_stop_area_path(referential)}']") end end diff --git a/spec/views/stop_areas/new.html.erb_spec.rb b/spec/views/stop_areas/new.html.erb_spec.rb index 7366a9dc5..ca466349c 100644 --- a/spec/views/stop_areas/new.html.erb_spec.rb +++ b/spec/views/stop_areas/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/stop_areas/new" do +describe "/stop_areas/new", :type => :view do assign_referential let!(:stop_area) { assign(:stop_area, build(:stop_area)) } @@ -8,7 +8,7 @@ describe "/stop_areas/new" do it "should render input for name" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][name=?]", stop_area.name end end diff --git a/spec/views/stop_areas/show.html.erb_spec.rb b/spec/views/stop_areas/show.html.erb_spec.rb index 019086dc3..64c62f164 100644 --- a/spec/views/stop_areas/show.html.erb_spec.rb +++ b/spec/views/stop_areas/show.html.erb_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' -describe "/stop_areas/show" do +describe "/stop_areas/show", :type => :view do assign_referential let!(:stop_area) { assign :stop_area, create(:stop_area) } let!(:access_points) { assign :access_points, [] } - let!(:map) { assign(:map, mock(:to_html => '<div id="map"/>'.html_safe)) } + let!(:map) { assign(:map, double(:to_html => '<div id="map"/>'.html_safe)) } it "should render h2 with the stop_area name" do render - rendered.should have_selector("h2", :text => Regexp.new(stop_area.name)) + expect(rendered).to have_selector("h2", :text => Regexp.new(stop_area.name)) end # it "should display a map with class 'stop_area'" do @@ -19,12 +19,12 @@ describe "/stop_areas/show" do it "should render a link to edit the stop_area" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_stop_area_path(referential, stop_area)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_stop_area_path(referential, stop_area)}']") end it "should render a link to remove the stop_area" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_stop_area_path(referential, stop_area)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_stop_area_path(referential, stop_area)}'][class='remove']") end end diff --git a/spec/views/time_tables/edit.html.erb_spec.rb b/spec/views/time_tables/edit.html.erb_spec.rb index 9c3cc485c..18c5d6d85 100644 --- a/spec/views/time_tables/edit.html.erb_spec.rb +++ b/spec/views/time_tables/edit.html.erb_spec.rb @@ -1,20 +1,20 @@ require 'spec_helper' -describe "/time_tables/edit" do +describe "/time_tables/edit", :type => :view do assign_referential let!(:time_table) { assign(:time_table, create(:time_table) ) } describe "test" do it "should render h2 with the group comment" do render - rendered.should have_selector("h2", :text => Regexp.new(time_table.comment)) + expect(rendered).to have_selector("h2", :text => Regexp.new(time_table.comment)) end end describe "form" do it "should render input for comment" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_tag "input[type=text][comment='time_table[comment]'][value=?]", time_table.comment end end diff --git a/spec/views/time_tables/index.html.erb_spec.rb b/spec/views/time_tables/index.html.erb_spec.rb index b8f1cb6d3..84cea756e 100644 --- a/spec/views/time_tables/index.html.erb_spec.rb +++ b/spec/views/time_tables/index.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/time_tables/index" do +describe "/time_tables/index", :type => :view do assign_referential let!(:time_tables) { assign :time_tables, Array.new(2){ create(:time_table) }.paginate } @@ -9,13 +9,13 @@ describe "/time_tables/index" do it "should render a show link for each group" do render time_tables.each do |time_table| - rendered.should have_selector(".time_table a[href='#{view.referential_time_table_path(referential, time_table)}']", :text => time_table.comment) + expect(rendered).to have_selector(".time_table a[href='#{view.referential_time_table_path(referential, time_table)}']", :text => time_table.comment) end end it "should render a link to create a new group" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{new_referential_time_table_path(referential)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{new_referential_time_table_path(referential)}']") end end diff --git a/spec/views/time_tables/new.html.erb_spec.rb b/spec/views/time_tables/new.html.erb_spec.rb index 6ec28add3..ee55a3322 100644 --- a/spec/views/time_tables/new.html.erb_spec.rb +++ b/spec/views/time_tables/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/time_tables/new" do +describe "/time_tables/new", :type => :view do assign_referential let!(:time_table) { assign(:time_table, build(:time_table)) } @@ -8,7 +8,7 @@ describe "/time_tables/new" do it "should render input for comment" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][comment=?]", time_table.comment end end diff --git a/spec/views/time_tables/show.html.erb_spec.rb b/spec/views/time_tables/show.html.erb_spec.rb index b5b7dedb3..352d67f4f 100644 --- a/spec/views/time_tables/show.html.erb_spec.rb +++ b/spec/views/time_tables/show.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/time_tables/show" do +describe "/time_tables/show", :type => :view do assign_referential let!(:time_table) { assign(:time_table, create(:time_table)) } @@ -9,17 +9,17 @@ describe "/time_tables/show" do it "should render h2 with the time_table comment" do render - rendered.should have_selector("h2", :text => Regexp.new(time_table.comment)) + expect(rendered).to have_selector("h2", :text => Regexp.new(time_table.comment)) end it "should render a link to edit the time_table" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.edit_referential_time_table_path(referential, time_table)}']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.edit_referential_time_table_path(referential, time_table)}']") end it "should render a link to remove the time_table" do render - view.content_for(:sidebar).should have_selector(".actions a[href='#{view.referential_time_table_path(referential, time_table)}'][class='remove']") + expect(view.content_for(:sidebar)).to have_selector(".actions a[href='#{view.referential_time_table_path(referential, time_table)}'][class='remove']") end end diff --git a/spec/views/vehicle_journeys/_form.html.erb_spec.rb b/spec/views/vehicle_journeys/_form.html.erb_spec.rb index 9cbeb76b0..5306e9977 100644 --- a/spec/views/vehicle_journeys/_form.html.erb_spec.rb +++ b/spec/views/vehicle_journeys/_form.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/vehicle_journeys/_form" do +describe "/vehicle_journeys/_form", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } @@ -9,23 +9,23 @@ describe "/vehicle_journeys/_form" do it "should render an input for transport_mode" do render - rendered.should have_selector( "select", :name => "vehicle_journey[transport_mode]") do |node| + expect(rendered).to have_selector( "select", :name => "vehicle_journey[transport_mode]") do |node| Chouette::Line.transport_modes.each do |mode| - node.should have_selector("option", :value => mode.text_code) + expect(node).to have_selector("option", :value => mode.text_code) end end end it "should render an input for comment" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][comment=]", vehicle_journey.comment end end context "stop's time view part" do it "should render stop's names" do render - rendered.should have_selector("form") do |form_node| + expect(rendered).to have_selector("form") do |form_node| vehicle_journey.stop_points.each do |sp| form_node.with_selector "label", :text => sp.stop_area.name end @@ -33,12 +33,12 @@ describe "/vehicle_journeys/_form" do end it "renders _vehicle_journey_at_stop_fields partial for each vehicle_journey_at_stop" do render - view.should render_template(:partial => "_vehicle_journey_at_stop_fields", :count => vehicle_journey.vehicle_journey_at_stops.count) + expect(view).to render_template(:partial => "_vehicle_journey_at_stop_fields", :count => vehicle_journey.vehicle_journey_at_stops.count) end it "should render vehicle_journey_at_stop's departure time" do render - rendered.should have_selector("form") do |form_node| + expect(rendered).to have_selector("form") do |form_node| vehicle_journey.stop_points.each_with_index do |sp, index| form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(4i)]" form_node.with_selector "select", :name => "vehicle_journey[vehicle_journey_at_stops_attributes][#{index}][departure_time(5i)]" @@ -49,7 +49,7 @@ describe "/vehicle_journeys/_form" do context "when existing vehicle_journey" do it "should display objectid not as an input" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][objectid=][disabled=true]", vehicle_journey.objectid end end @@ -58,7 +58,7 @@ describe "/vehicle_journeys/_form" do let!(:vehicle_journey) { assign :vehicle_journey, build(:vehicle_journey, :route => route) } it "should render an input for objectid" do render - rendered.should have_selector("form") do + expect(rendered).to have_selector("form") do with_selector "input[type=text][objectid=][disabled=false]", vehicle_journey.objectid end end diff --git a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb index 5eebb0e83..4b9e50f14 100644 --- a/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb +++ b/spec/views/vehicle_journeys/_vehicle_journey_at_stop_fields.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/vehicle_journeys/_vehicle_journey_at_stop_fields" do +describe "/vehicle_journeys/_vehicle_journey_at_stop_fields", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } @@ -19,45 +19,45 @@ describe "/vehicle_journeys/_vehicle_journey_at_stop_fields" do it "should render vehicle_journey_at_stop's departure time" do render_collection - rendered.should have_selector("td select", :name => "#{field_name}[departure_time(5i)]") + expect(rendered).to have_selector("td select", :name => "#{field_name}[departure_time(5i)]") end it "should render vehicle_journey_at_stop's stop_point_id" do render_collection - rendered.should have_selector("td input", :name => "#{field_name}[stop_point_id]", + expect(rendered).to have_selector("td input", :name => "#{field_name}[stop_point_id]", :value => vehicle_journey_at_stop.stop_point_id) end it "should render vehicle_journey_at_stop's id" do render_collection - rendered.should have_selector("td input", :name => "#{field_name}[id]", + expect(rendered).to have_selector("td input", :name => "#{field_name}[id]", :value => vehicle_journey_at_stop.id) end it "should render vehicle_journey_at_stop's _destroy" do render_collection - rendered.should have_selector("td input", :name => "#{field_name}[_destroy]", + expect(rendered).to have_selector("td input", :name => "#{field_name}[_destroy]", :value => (vehicle_journey_at_stop._destroy ? "1" : "0")) end it "should render vehicle_journey_at_stop's stop name" do render_collection - rendered.should have_selector("td label", :text => vehicle_journey_at_stop.stop_point.stop_area.name ) + expect(rendered).to have_selector("td label", :text => vehicle_journey_at_stop.stop_point.stop_area.name ) end context "for a destroyed vehicle_journey_at_stop" do before(:each) do - vehicle_journey_at_stop.stub!(:_destroy => true) + allow(vehicle_journey_at_stop).to receive_messages(:_destroy => true) end it "should render tr.no_stop" do pending render_collection - rendered.should have_selector("tr.no_stop") + expect(rendered).to have_selector("tr.no_stop") end end context "for a not destroyed vehicle_journey_at_stop" do before(:each) do - vehicle_journey_at_stop.stub!(:_destroy => false) + allow(vehicle_journey_at_stop).to receive_messages(:_destroy => false) end it "should not render tr.no_stop" do render_collection - rendered.should_not have_selector("tr.no_stop") + expect(rendered).not_to have_selector("tr.no_stop") end end end diff --git a/spec/views/vehicle_journeys/edit.html.erb_spec.rb b/spec/views/vehicle_journeys/edit.html.erb_spec.rb index c7db87706..066200aab 100644 --- a/spec/views/vehicle_journeys/edit.html.erb_spec.rb +++ b/spec/views/vehicle_journeys/edit.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/vehicle_journeys/edit" do +describe "/vehicle_journeys/edit", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } @@ -9,7 +9,7 @@ describe "/vehicle_journeys/edit" do it "renders _form" do render - view.should render_template(:partial => "_form") + expect(view).to render_template(:partial => "_form") end end diff --git a/spec/views/vehicle_journeys/new.html.erb_spec.rb b/spec/views/vehicle_journeys/new.html.erb_spec.rb index bc0d68c2d..546e89ac8 100644 --- a/spec/views/vehicle_journeys/new.html.erb_spec.rb +++ b/spec/views/vehicle_journeys/new.html.erb_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe "/vehicle_journeys/new" do +describe "/vehicle_journeys/new", :type => :view do assign_referential let!(:line) { assign :line, create(:line) } @@ -9,7 +9,7 @@ describe "/vehicle_journeys/new" do it "renders _form" do render - view.should render_template(:partial => "_form") + expect(view).to render_template(:partial => "_form") end end |