Skip to content

Commit

Permalink
fixing up the specs.
Browse files Browse the repository at this point in the history
  • Loading branch information
mneedham committed Oct 31, 2010
1 parent 41d73bb commit c870bea
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 51 deletions.
2 changes: 2 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,5 @@ require 'rake/testtask'
require 'rake/rdoctask'

require 'tasks/rails'

task :default =>[:spec]
4 changes: 2 additions & 2 deletions app/models/code_submission.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ class CodeSubmission < ActiveRecord::Base
attr_accessor :upload
validates_format_of :upload, :with => /\.zip$/, :message => ZIP_FILES_ONLY

def save (upload)
@upload_params = upload
def save (uploaded_file_params)
@upload_params = uploaded_file_params
super
end

Expand Down
30 changes: 23 additions & 7 deletions spec/controllers/code_submissions_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -1,23 +1,39 @@
require 'spec/spec_helper'
require 'spec_helper'

describe CodeSubmissionsController do
describe "zip extension file" do
it "will be uploaded" do
get :create, :code_submission_request => { :upload => "some_file.zip" }
uploaded_file = double("uploaded_file")
uploaded_file.stub!(:original_filename).and_return("some_file.zip")
uploaded_file.stub!(:read)

File.stub!("open")

get :create, :upload => {"datafile" => uploaded_file}

response.should redirect_to code_submission_path(1)
end
end
describe "non zip extension file" do
it "returns error message" do
get :create, :code_submission_request => { :upload => "c:/some/shit" }
response.flash[:error].should == CodeSubmissionRequest::ZIP_FILES_ONLY
uploaded_file = double("uploaded_file")
uploaded_file.stub!(:original_filename).and_return("c:/some/shit.extension")
uploaded_file.stub!(:read)

get :create, :upload => {"datafile" => uploaded_file}

response.flash[:error].should == CodeSubmissionRequest::ZIP_FILES_ONLY
response.should render_template "new"
end

it "keeps the name of the selected file in the field" do
get :create, :code_submission_request => { :upload => "c:/some/shit" }
it "keeps the name of the selected file in the field" do
uploaded_file = double("uploaded_file")
uploaded_file.stub!(:original_filename).and_return("c:/some/shit.extension")
uploaded_file.stub!(:read)

get :create, :upload => {"datafile" => uploaded_file}

assigns(:code_submission_request).upload.should == "c:/some/shit"
assigns(:code_submission_request).upload.should == "c:/some/shit.extension"
end
end
end
23 changes: 0 additions & 23 deletions spec/controllers/code_submissions_spec.rb

This file was deleted.

14 changes: 0 additions & 14 deletions spec/models/code_submission_request_spec.rb

This file was deleted.

14 changes: 11 additions & 3 deletions spec/models/code_submission_spec.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
require 'spec/spec_helper'
require 'spec_helper'

describe CodeSubmission do
it "should be invalid on an upload with a non .zip extension" do
request = CodeSubmission.new({:upload => "non/zip.extension"})
request.save.should be_false
request.save({}).should be_false
request.errors.on(:upload).should == CodeSubmission::ZIP_FILES_ONLY
end

it "should be valid an upload with .zip extension" do
request = CodeSubmission.new({:upload => "non/something.zip"})
request.save.should be_true

uploaded_file = double("uploaded_file")
uploaded_file.stub!(:original_filename).and_return("non/something.zip")
uploaded_file.stub!(:read)
uploaded_file_params = {"datafile" => uploaded_file}

File.stub!("open")

request.save(uploaded_file_params).should be_true
request.errors.on(:upload).should == nil
end

Expand Down
6 changes: 4 additions & 2 deletions spec/services/bayes_me_up_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
require 'spec/spec_helper'
require 'spec_helper'

describe BayesMeUp do

it "should be awesome" do

end

end

0 comments on commit c870bea

Please sign in to comment.