diff options
author | Izaak Alpert <ihalpert@blackberry.com> | 2013-04-25 18:15:33 +0400 |
---|---|---|
committer | Izaak Alpert <ialpert@blackberry.com> | 2013-07-18 06:41:30 +0400 |
commit | 3d7194f0112da12e8732df9ffe8b34fe7d0a9f6b (patch) | |
tree | 9b3c68c04b5ead5e35456595a07453b036b2dbc8 /features/steps/dashboard | |
parent | fd033671933fcc0f472480d98c907aefde357416 (diff) |
Merge Request on forked projects
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
Diffstat (limited to 'features/steps/dashboard')
-rw-r--r-- | features/steps/dashboard/dashboard.rb | 1 | ||||
-rw-r--r-- | features/steps/dashboard/dashboard_event_filters.rb | 2 | ||||
-rw-r--r-- | features/steps/dashboard/dashboard_merge_requests.rb | 20 |
3 files changed, 15 insertions, 8 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 329571ac6ef..596b5a78170 100644 --- a/features/steps/dashboard/dashboard.rb +++ b/features/steps/dashboard/dashboard.rb @@ -22,6 +22,7 @@ class Dashboard < Spinach::FeatureSteps Then 'I see prefilled new Merge Request page' do current_path.should == new_project_merge_request_path(@project) + find("#merge_request_target_project_id").value.should == @project.id.to_s find("#merge_request_source_branch").value.should == "new_design" find("#merge_request_target_branch").value.should == "master" find("#merge_request_title").value.should == "New Design" diff --git a/features/steps/dashboard/dashboard_event_filters.rb b/features/steps/dashboard/dashboard_event_filters.rb index 09da4e6756f..d0fe5c9b64b 100644 --- a/features/steps/dashboard/dashboard_event_filters.rb +++ b/features/steps/dashboard/dashboard_event_filters.rb @@ -61,7 +61,7 @@ class EventFilters < Spinach::FeatureSteps end And 'this project has merge request event' do - merge_request = create :merge_request, author: @user, project: @project + merge_request = create :merge_request, author: @user, source_project: @project, target_project: @project Event.create( project: @project, action: Event::MERGED, diff --git a/features/steps/dashboard/dashboard_merge_requests.rb b/features/steps/dashboard/dashboard_merge_requests.rb index 7cfa8a13ff8..6c1fa39f081 100644 --- a/features/steps/dashboard/dashboard_merge_requests.rb +++ b/features/steps/dashboard/dashboard_merge_requests.rb @@ -6,18 +6,24 @@ class DashboardMergeRequests < Spinach::FeatureSteps merge_requests = @user.merge_requests merge_requests.each do |mr| page.should have_content(mr.title[0..10]) - page.should have_content(mr.project.name) + page.should have_content(mr.target_project.name) + page.should have_content(mr.source_project.name) end end And 'I have authored merge requests' do - project1 = create :project - project2 = create :project + project1_source = create :project + project1_target= create :project + project2_source = create :project + project2_target = create :project - project1.team << [@user, :master] - project2.team << [@user, :master] - merge_request1 = create :merge_request, author: @user, project: project1 - merge_request2 = create :merge_request, author: @user, project: project2 + project1_source.team << [@user, :master] + project1_target.team << [@user, :master] + project2_source.team << [@user, :master] + project2_target.team << [@user, :master] + + merge_request1 = create :merge_request, author: @user, source_project: project1_source, target_project: project1_target + merge_request2 = create :merge_request, author: @user, source_project: project2_source, target_project: project2_target end end |