From 29ba2e7da02b5bc196a6d7f7ebe165a4d48fa137 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Thu, 11 Dec 2014 08:22:23 -0200 Subject: [PATCH] Fixed unit tests for ResourceFinder that came from rebase --- Gemfile.lock | 2 +- app/controllers/concerns/resource_finder.rb | 2 +- spec/controllers/concerns/resource_finder_spec.rb | 2 +- spec/controllers/projects_controller_spec.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 3e36af0..6018c5b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/mezuro/kalibro_client - revision: a4cbc5b350e5a4ea0b5abe6e2ec53008474df161 + revision: a4a393e41b5cd53d55e91e574ab9a7d7e6eddc5d specs: kalibro_client (0.0.1) activeresource (~> 4.0.0) diff --git a/app/controllers/concerns/resource_finder.rb b/app/controllers/concerns/resource_finder.rb index 766d44a..0b532e6 100644 --- a/app/controllers/concerns/resource_finder.rb +++ b/app/controllers/concerns/resource_finder.rb @@ -4,7 +4,7 @@ module ResourceFinder def find_resource(klass, id) begin klass.find(id) - rescue KalibroGatekeeperClient::Errors::RecordNotFound + rescue KalibroClient::Errors::RecordNotFound respond_to do |format| format.html { render file: "#{Rails.root}/public/404", layout: false, status: :not_found } end diff --git a/spec/controllers/concerns/resource_finder_spec.rb b/spec/controllers/concerns/resource_finder_spec.rb index 0971dfa..41b128a 100644 --- a/spec/controllers/concerns/resource_finder_spec.rb +++ b/spec/controllers/concerns/resource_finder_spec.rb @@ -24,7 +24,7 @@ describe ResourceFinder, type: :controller do context 'when the resource does not exists' do before :each do - klass.expects(:find).with(id).raises(KalibroGatekeeperClient::Errors::RecordNotFound) + klass.expects(:find).with(id).raises(KalibroClient::Errors::RecordNotFound) end # FIXME: this is not the best test, but it it's the closest we can think of diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index c5d9807..0d5056d 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -75,7 +75,7 @@ describe ProjectsController, :type => :controller do context 'when the project does not exists' do before :each do - Project.expects(:find).with(project.id).raises(KalibroGatekeeperClient::Errors::RecordNotFound) + Project.expects(:find).with(project.id).raises(KalibroClient::Errors::RecordNotFound) get :show, :id => project.id end -- libgit2 0.21.2