Commit a4993f16 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fixed migration, test for MR

parent 5a3f23f3
class AddMergedToMergeRequest < ActiveRecord::Migration class AddMergedToMergeRequest < ActiveRecord::Migration
def change def change
add_column :merge_requests, :merged, :true, :null => false, :default => false add_column :merge_requests, :merged, :boolean, :null => false, :default => false
end end
end end
...@@ -50,8 +50,22 @@ ActiveRecord::Schema.define(:version => 20120315132931) do ...@@ -50,8 +50,22 @@ ActiveRecord::Schema.define(:version => 20120315132931) do
t.integer "project_id" t.integer "project_id"
end end
# Could not dump table "merge_requests" because of following StandardError create_table "merge_requests", :force => true do |t|
# Unknown type 'true' for column 'merged' t.string "target_branch", :null => false
t.string "source_branch", :null => false
t.integer "project_id", :null => false
t.integer "author_id"
t.integer "assignee_id"
t.string "title"
t.boolean "closed", :default => false, :null => false
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.text "st_commits"
t.text "st_diffs"
t.boolean "merged", :default => false, :null => false
end
add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
create_table "notes", :force => true do |t| create_table "notes", :force => true do |t|
t.text "note" t.text "note"
......
...@@ -42,7 +42,7 @@ describe "MergeRequests" do ...@@ -42,7 +42,7 @@ describe "MergeRequests" do
it { should have_content(@merge_request.title[0..10]) } it { should have_content(@merge_request.title[0..10]) }
it "Show page should inform user that merge request closed" do it "Show page should inform user that merge request closed" do
page.should have_content "Reopen" page.should have_content "Closed"
end end
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment