diff options
Diffstat (limited to 'spec/controllers/api/v1')
| -rw-r--r-- | spec/controllers/api/v1/lines_controller_spec.rb | 4 | ||||
| -rw-r--r-- | spec/controllers/api/v1/networks_controller_spec.rb | 6 | ||||
| -rw-r--r-- | spec/controllers/api/v1/stop_area_controller_spec.rb | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/spec/controllers/api/v1/lines_controller_spec.rb b/spec/controllers/api/v1/lines_controller_spec.rb index 1d9383593..d57eed766 100644 --- a/spec/controllers/api/v1/lines_controller_spec.rb +++ b/spec/controllers/api/v1/lines_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::V1::LinesController do +describe Api::V1::LinesController, :type => :controller do let!(:line) { referential.lines.first || create(:line) } it_behaves_like "api key protected controller" do @@ -14,7 +14,7 @@ describe Api::V1::LinesController do end it "should assign expected lines" do - assigns[:lines].should == [line] + expect(assigns[:lines]).to eq([line]) end end end diff --git a/spec/controllers/api/v1/networks_controller_spec.rb b/spec/controllers/api/v1/networks_controller_spec.rb index 01e3ee35d..1872625ca 100644 --- a/spec/controllers/api/v1/networks_controller_spec.rb +++ b/spec/controllers/api/v1/networks_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::V1::NetworksController do +describe Api::V1::NetworksController, :type => :controller do let!(:network) { referential.networks.first || create(:network) } it_behaves_like "api key protected controller" do @@ -15,7 +15,7 @@ describe Api::V1::NetworksController do end it "should assign expected network" do - assigns[:network].should == network + expect(assigns[:network]).to eq(network) end end end @@ -27,7 +27,7 @@ describe Api::V1::NetworksController do end it "should assign expected networks" do - assigns[:networks].should == [network] + expect(assigns[:networks]).to eq([network]) end end end diff --git a/spec/controllers/api/v1/stop_area_controller_spec.rb b/spec/controllers/api/v1/stop_area_controller_spec.rb index 8f1b47078..eb0c87661 100644 --- a/spec/controllers/api/v1/stop_area_controller_spec.rb +++ b/spec/controllers/api/v1/stop_area_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Api::V1::StopAreasController do +describe Api::V1::StopAreasController, :type => :controller do let!(:stop_area) { referential.stop_areas.first || create(:stop_area) } it_behaves_like "api key protected controller" do @@ -14,7 +14,7 @@ describe Api::V1::StopAreasController do get :index, :route_id => route.objectid, :line_id => route.line.objectid end it "should assign expected stop_areas" do - assigns[:stop_areas].map(&:id).sort.should == route.stop_areas.map(&:id).sort + expect(assigns[:stop_areas].map(&:id).sort).to eq(route.stop_areas.map(&:id).sort) end end describe "GET #index, :q => { :name_cont => 'aa'}" do @@ -26,7 +26,7 @@ describe Api::V1::StopAreasController do get :index, :q => { :name_cont => "aa"} end it "should assign expected stop_areas" do - assigns[:stop_areas].map(&:name).sort.should == [ sa1.name, sa2.name] + expect(assigns[:stop_areas].map(&:name).sort).to eq([ sa1.name, sa2.name]) end end end |
