mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-11 21:56:19 +10:00
Izaak AlpertandIzaak Alpert
3d7194f011
The good: - You can do a merge request for a forked commit and it will merge properly (i.e. it does work). - Push events take into account merge requests on forked projects - Tests around merge_actions now present, spinach, and other rspec tests - Satellites now clean themselves up rather then recreate The questionable: - Events only know about target projects - Project's merge requests only hold on to MR's where they are the target - All operations performed in the satellite The bad: - Duplication between project's repositories and satellites (e.g. commits_between) (for reference: http://feedback.gitlab.com/forums/176466-general/suggestions/3456722-merge-requests-between-projects-repos) Fixes: Make test repos/satellites only create when needed -Spinach/Rspec now only initialize test directory, and setup stubs (things that are relatively cheap) -project_with_code, source_project_with_code, and target_project_with_code now create/destroy their repos individually -fixed remote removal -How to merge renders properly -Update emails to show project/branches -Edit MR doesn't set target branch -Fix some failures on editing/creating merge requests, added a test -Added back a test around merge request observer -Clean up project_transfer_spec, Remove duplicate enable/disable observers -Ensure satellite lock files are cleaned up, Attempted to add some testing around these as well -Signifant speed ups for tests -Update formatting ordering in notes_on_merge_requests -Remove wiki schema update Fixes for search/search results -Search results was using by_project for a list of projects, updated this to use in_projects -updated search results to reference the correct (target) project -udpated search results to print both sides of the merge request Change-Id: I19407990a0950945cc95d62089cbcc6262dab1a8
50 lines
1.5 KiB
Ruby
50 lines
1.5 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe Commit do
|
|
let(:commit) { create(:project_with_code).repository.commit }
|
|
|
|
describe '#title' do
|
|
it "returns no_commit_message when safe_message is blank" do
|
|
commit.stub(:safe_message).and_return('')
|
|
commit.title.should == "--no commit message"
|
|
end
|
|
|
|
it "truncates a message without a newline at 70 characters" do
|
|
message = commit.safe_message * 10
|
|
|
|
commit.stub(:safe_message).and_return(message)
|
|
commit.title.should == "#{message[0..69]}…"
|
|
end
|
|
|
|
it "truncates a message with a newline before 80 characters at the newline" do
|
|
message = commit.safe_message.split(" ").first
|
|
|
|
commit.stub(:safe_message).and_return(message + "\n" + message)
|
|
commit.title.should == message
|
|
end
|
|
|
|
it "truncates a message with a newline after 80 characters at 70 characters" do
|
|
message = (commit.safe_message * 10) + "\n"
|
|
|
|
commit.stub(:safe_message).and_return(message)
|
|
commit.title.should == "#{message[0..69]}…"
|
|
end
|
|
end
|
|
|
|
describe "delegation" do
|
|
subject { commit }
|
|
|
|
it { should respond_to(:message) }
|
|
it { should respond_to(:authored_date) }
|
|
it { should respond_to(:committed_date) }
|
|
it { should respond_to(:committer_email) }
|
|
it { should respond_to(:author_email) }
|
|
it { should respond_to(:parents) }
|
|
it { should respond_to(:date) }
|
|
it { should respond_to(:diffs) }
|
|
it { should respond_to(:tree) }
|
|
it { should respond_to(:id) }
|
|
it { should respond_to(:to_patch) }
|
|
end
|
|
end
|