Merge pull request #165 from abf/rosa-build:42-fix_issues_api

#42 fix rendering

app/controllers/api/v1/issues_controller.rb

@@ -34,7 +34,6 @@ class Api::V1::IssuesController < Api::V1::BaseController
   end
 
   def show
-    respond_with @issue
   end
 
   def create
@@ -65,9 +64,9 @@ class Api::V1::IssuesController < Api::V1::BaseController
       when 'none'
         @issues = @issues.where(:assigned_id => nil)
       when '*'
-        @issues = @issues.where('assigned_id IS NOT NULL')
+        @issues = @issues.where('issues.assigned_id IS NOT NULL')
       else
-        @issues = @issues.where('assignees_issues.uname = ?', params[:assignee])
+        @issues = @issues.where('issues.assignees_issues.uname = ?', params[:assignee])
       end
     end
 
@@ -92,9 +91,9 @@ class Api::V1::IssuesController < Api::V1::BaseController
     direction = params[:direction] == 'asc' ? 'ASC' : 'DESC'
     @issues = @issues.order("#{sort} #{direction}")
 
-    @issues = @issues.where('created_at >= to_timestamp(?)', params[:since]) if params[:since] =~ /\A\d+\z/
+    @issues = @issues.where('issues.created_at >= to_timestamp(?)', params[:since]) if params[:since] =~ /\A\d+\z/
     @issues.paginate(paginate_params)
-    respond_with @issues
+    render :index
   end
 
   def get_all_project_ids default_project_ids

spec/controllers/api/v1/issues_controller_spec.rb

@@ -40,6 +40,11 @@ describe Api::V1::IssuesController do
         response.should be_success
       end
 
+      it 'should render right template for show action' do
+        get :show, :project_id => @project.id, :id => @issue.serial_id, :format => :json
+        response.should render_template('api/v1/issues/show')
+      end
+
       it 'can show issue in open project' do
         get :show, :project_id => @open_project.id, :id => @open_issue.serial_id, :format => :json
         response.should be_success
@@ -62,12 +67,22 @@ describe Api::V1::IssuesController do
         assigns[:issues].should include(@membered_issue)
       end
 
+      it 'should render right template for all index action' do
+        get :all_index, :format => :json
+        response.should render_template('api/v1/issues/index')
+      end
+
       it 'should return only assigned issue' do
         http_login(@issue.user)
         get :user_index, :format => :json
         assigns[:issues].should include(@own_hidden_issue)
         assigns[:issues].count.should == 1
       end
+
+      it 'should render right template for user index action' do
+        get :user_index, :format => :json
+        response.should render_template('api/v1/issues/index')
+      end
     end
 
     context 'for anonymous user' do