cafe-grader-web Commit - r79:bfeeb31156cf

cafe-grader-web

Commit `r79:bfeeb31156cf` public

parent | child

Description:

[web] add test result page git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@159 6386c4cd-e34a-4fa8-8920-d93eb39b512e

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r79:bfeeb31156cf - Thu, 03 Apr 2008 19:33:32 - 5 files changed: 41 inserted, 4 deleted

app/controllers/test_controller.rb ¶ +21 -3

               class TestController < ApplicationController
                 before_filter :authenticate
-            -   verify :method => :post, :only => [:test_submit],
+            +   verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   @user = User.find(session[:user_id])
                   prepare_index_information
                   @test_requests = @user.test_requests
                 end
                 def submit
                   @user = User.find(session[:user_id])
                   test_request = TestRequest.new_from_form_params(@user,params[:test_request])
                   if test_request.save
                     redirect_to :action => 'index'
                   else
                     flash[:notice] = 'Error saving your test submission'
                     redirect_to :action => 'index'
                   end
                 end
                 def read
                   user = User.find(session[:user_id])
-            -     test_request = TestRequest.find(params[:id])
-            -     if test_request.user_id != user.id
+            +     begin
+            +       test_request = TestRequest.find(params[:id])
+            +     rescue
+            +       test_request = nil
+            +     end
+            +     if test_request==nil or test_request.user_id != user.id
                     flash[:notice] = 'Invalid output'
                     redirect_to :action => 'index'
                     return
                   end
                   if test_request.output_file_name!=nil
                     data = File.open(test_request.output_file_name).read(2048)
                     if data==nil
                       data=""
                     end
                     send_data(data,
                               {:filename => 'output.txt',
                                 :type => 'text/plain'})
                     return
                   end
                   redirect_to :action => 'index'
                 end
+            +
+            +   def result
+            +     @user = User.find(session[:user_id])
+            +     begin
+            +       @test_request = TestRequest.find(params[:id])
+            +     rescue
+            +       @test_request = nil
+            +     end
+            +     if @test_request==nil or @test_request.user_id != @user.id
+            +       flash[:notice] = 'Invalid request'
+            +       redirect_to :action => 'index'
+            +       return
+            +     end
+            +   end
                 protected
                 def prepare_index_information
                   @submissions = Submission.find_last_for_all_available_problems(@user.id)
                   @problems = @submissions.collect { |submission| submission.problem }
                 end
               end

app/helpers/test_helper.rb ¶ +9

		@@ -1,2 +1,11
1	1	module TestHelper
	2	+
	3	+ def read_textfile(fname,max_size=2048)
	4	+ begin
	5	+ File.open(fname).read(max_size)
	6	+ rescue
	7	+ nil
	8	+ end
	9	+ end
	10	+
2	11	end

app/views/test/_test_request.html.haml ¶ +1

                   = format_short_time(test_request.submitted_at)
                 %td= test_request.problem.full_name
                 %td{:align => "center"}
                   = test_request.submission.number
                 %td{:align => "center"}
                   = test_request.status_str
                 %td= simple_format((test_request.running_stat or ''))
                 %td{:align => "center"}
                   - if test_request.output_file_name!=nil
                     = link_to '[output]', :action => 'read', :id => test_request.id
                 %td= test_request.grader_comment or ''
                 %td= simple_format((test_request.compiler_message or ''))
+            +   %td= link_to '[view]', :action => 'result', :id => test_request.id

app/views/test/index.html.erb ¶ +1

               <h3>Previous requests</h3>
               <table class="info">
                 <tr class="info-head">
                   <th>at</th>
                   <th>problem</th>
                   <th>sub #</th>
                   <th>status</th>
                   <th>running stat</th>
                   <th>output (first 2kb)</th>
                   <th>grading comment</th>
                   <th>compiler message</th>
+            +     <th>Detail</th>
                 </tr>
                 <%= render :partial => 'test_request', :collection => @test_requests %>
               </table>
               <% end %>

spec/controllers/main_controller_spec.rb ¶ +9 -1

                 before(:each) do
                   @problem = mock(Problem, :name => 'test')
                   @language = mock(Language, :name => 'cpp', :ext => 'cpp')
                   @submission = mock(Submission,
                                      :id => 1,
                                      :user_id => 1,
                                      :problem => @problem,
                                      :language => @language,
                                      :source => 'sample source',
                                      :compiler_message => 'none')
                   @user = mock(User, :id => 1, :login => 'john')
-            -     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
+            +   end
+            +
+            +   it "should redirect user to login page when unlogged-in user try to access main/list" do
+            +     get 'list'
+            +     response.should redirect_to(:action => 'login')
                 end
                 it "should let user sees her own source" do
+            +     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
                   get 'source', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should let user sees her own compiler message" do
+            +     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
                   get 'compiler_msg', {:id => @submission.id}, {:user_id => 1}
                   response.should be_success
                 end
                 it "should not let user sees other user's source" do
+            +     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
                   get 'source', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end
                 it "should not let user sees other user's compiler message" do
+            +     Submission.should_receive(:find).with(@submission.id.to_s).and_return(@submission)
                   get 'compiler_msg', {:id => @submission.id}, {:user_id => 2}
                   flash[:notice].should =~ /[Ee]rror/
                   response.should redirect_to(:action => 'list')
                 end
               end

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r79:bfeeb31156cf - Thu, 03 Apr 2008 19:33:32 - 5 files changed: 41 inserted, 4 deleted

Sign in to your account

Commit r79:bfeeb31156cf public

Author

r79:bfeeb31156cf - Thu, 03 Apr 2008 19:33:32 - 5 files changed: 41 inserted, 4 deleted

Commit `r79:bfeeb31156cf` public