Commit a4993f16c0239c8615b8d068c6e53415209f8cb1

Authored by Dmitriy Zaporozhets
1 parent 5a3f23f3

Fixed migration, test for MR

db/migrate/20120315132931_add_merged_to_merge_request.rb
1 1 class AddMergedToMergeRequest < ActiveRecord::Migration
2 2 def change
3   - add_column :merge_requests, :merged, :true, :null => false, :default => false
  3 + add_column :merge_requests, :merged, :boolean, :null => false, :default => false
4 4 end
5 5 end
... ...
db/schema.rb
... ... @@ -50,8 +50,22 @@ ActiveRecord::Schema.define(:version =&gt; 20120315132931) do
50 50 t.integer "project_id"
51 51 end
52 52  
53   -# Could not dump table "merge_requests" because of following StandardError
54   -# Unknown type 'true' for column 'merged'
  53 + create_table "merge_requests", :force => true do |t|
  54 + t.string "target_branch", :null => false
  55 + t.string "source_branch", :null => false
  56 + t.integer "project_id", :null => false
  57 + t.integer "author_id"
  58 + t.integer "assignee_id"
  59 + t.string "title"
  60 + t.boolean "closed", :default => false, :null => false
  61 + t.datetime "created_at", :null => false
  62 + t.datetime "updated_at", :null => false
  63 + t.text "st_commits"
  64 + t.text "st_diffs"
  65 + t.boolean "merged", :default => false, :null => false
  66 + end
  67 +
  68 + add_index "merge_requests", ["project_id"], :name => "index_merge_requests_on_project_id"
55 69  
56 70 create_table "notes", :force => true do |t|
57 71 t.text "note"
... ...
spec/requests/merge_requests_spec.rb
... ... @@ -42,7 +42,7 @@ describe &quot;MergeRequests&quot; do
42 42  
43 43 it { should have_content(@merge_request.title[0..10]) }
44 44 it "Show page should inform user that merge request closed" do
45   - page.should have_content "Reopen"
  45 + page.should have_content "Closed"
46 46 end
47 47 end
48 48 end
... ...