From 44ca50196221ee9098dbf303377c657cb5c3e4c0 Mon Sep 17 00:00:00 2001 From: Vladimir Sharshov Date: Mon, 16 Apr 2012 21:51:51 +0400 Subject: [PATCH] [Refs #194] Fix tests [Refs #263] Update kernel API call --- db/schema.rb | 8 ++++---- lib/build_server.rb | 4 ++-- spec/controllers/comments_controller_spec.rb | 2 +- spec/controllers/issues_controller_spec.rb | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index f0fd95e9d..8065f16ee 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20120413102757) do +ActiveRecord::Schema.define(:version => 20120413160722) do create_table "activity_feeds", :force => true do |t| t.integer "user_id", :null => false @@ -147,13 +147,13 @@ ActiveRecord::Schema.define(:version => 20120413102757) do create_table "issues", :force => true do |t| t.integer "serial_id" t.integer "project_id" - t.integer "user_id" + t.integer "assignee_id" t.string "title" t.text "body" - t.string "status", :default => "open" + t.string "status", :default => "open" t.datetime "created_at" t.datetime "updated_at" - t.integer "creator_id" + t.integer "user_id" t.datetime "closed_at" t.integer "closed_by" end diff --git a/lib/build_server.rb b/lib/build_server.rb index eded06989..c09e89794 100644 --- a/lib/build_server.rb +++ b/lib/build_server.rb @@ -96,7 +96,7 @@ class BuildServer self.client.call('get_status') end - def self.freeze platform_name, new_repo_name = nil - self.client.call('freeze_platform', platform_name, new_repo_name) + def self.freeze platform_name + self.client.call('freeze_platform', platform_name) end end diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb index 188b323b8..d6c7c71d3 100644 --- a/spec/controllers/comments_controller_spec.rb +++ b/spec/controllers/comments_controller_spec.rb @@ -75,7 +75,7 @@ describe CommentsController do stub_rsync_methods @project = FactoryGirl.create(:project) - @issue = FactoryGirl.create(:issue, :project_id => @project.id, :creator => FactoryGirl.create(:user)) + @issue = FactoryGirl.create(:issue, :project_id => @project.id, :user => FactoryGirl.create(:user)) @comment = FactoryGirl.create(:comment, :commentable => @issue, :project_id => @project.id) @create_params = {:comment => {:body => 'I am a comment!'}, :project_id => @project.id, :issue_id => @issue.serial_id} diff --git a/spec/controllers/issues_controller_spec.rb b/spec/controllers/issues_controller_spec.rb index e2377c969..2816ccd1e 100644 --- a/spec/controllers/issues_controller_spec.rb +++ b/spec/controllers/issues_controller_spec.rb @@ -181,7 +181,7 @@ describe IssuesController do set_session_for(@issue_user) end - it_should_behave_like 'user with issue update rights' + it_should_behave_like 'user without issue update rights' it_should_behave_like 'user without issue destroy rights' it_should_behave_like 'project with issues turned off' end