Fixed controller tests for JS actions

Rafael Manzo
1 parent 057d1aa0
Showing 2 changed files with 7 additions and 14 deletions Show diff stats
spec/controllers/modules_controller_spec.rb
spec/controllers/repositories_controller_spec.rb
@@ -4,9 +4,8 @@ describe ModulesController do
   describe "load_module_tree" do
     before :each do
       ModuleResult.expects(:find).with(42).returns(FactoryGirl.build(:module_result))
-      request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-      post :load_module_tree, {id: 42}
+      post :load_module_tree, id: 42, format: :js
     end
     it { should respond_with(:success) }
@@ -24,8 +23,7 @@ describe ModulesController do
       ModuleResult.expects(:find).at_least_once.with(module_result.id).returns(module_result)
       subject.expire_fragment("#{module_result.id}_#{metric_name}")
-      request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-      get :metric_history, id: module_result.id, metric_name: metric_name, module_id: module_id
+      get :metric_history, id: module_result.id, metric_name: metric_name, module_id: module_id, format: :js
     end
     it { should respond_with(:success) }
@@ -251,8 +251,7 @@ describe RepositoriesController do
         repository.expects(:last_processing).returns(nil)
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
-        request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-        get :state, project_id: project.id.to_s, id: repository.id, last_state: ''
+        get :state, project_id: project.id.to_s, id: repository.id, last_state: '', format: :js
       end
       it { should respond_with(:success) }
@@ -266,8 +265,7 @@ describe RepositoriesController do
         repository.expects(:last_processing).returns(ready_processing)
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
-        request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'ANALYZING'
+        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'ANALYZING', format: :js
       end
       it { should respond_with(:success) }
@@ -281,8 +279,7 @@ describe RepositoriesController do
         repository.expects(:last_processing).returns(processing)
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
-        request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'LOADING'
+        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'LOADING', format: :js
       end
       it { should respond_with(:success) }
@@ -293,8 +290,7 @@ describe RepositoriesController do
       before :each do
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
-        request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'READY'
+        get :state, project_id: project.id.to_s, id: repository.id, last_state: 'READY', format: :js
       end
       it { should respond_with(:ok) }
@@ -308,8 +304,7 @@ describe RepositoriesController do
         Repository.expects(:find).at_least_once.with(repository.id).returns(repository)
         Processing.expects(:processing_with_date_of).with(repository.id, "2013-11-11").returns(processing)
-        request.env["HTTP_ACCEPT"] = 'application/javascript' # FIXME: there should be a better way to force JS
-        get :state, project_id: project.id.to_s, id: repository.id, last_state: '', day: '11', month: '11', year: '2013'
+        get :state, project_id: project.id.to_s, id: repository.id, last_state: '', day: '11', month: '11', year: '2013', format: :js
       end
       it { should respond_with(:ok) }