diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-06-23 08:24:39 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-06-23 08:24:39 +0300 |
| commit | 359ed48638a7442f36b271f283d6a7b8d31225c4 (patch) | |
| tree | 9b17d7688cb87f8e2200aa3b15e7848413208f23 /spec/services | |
| parent | 871bb2f14376355f08ecc9812feec020429e0662 (diff) | |
Fix Style/AlignHash cop violations
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/merge_requests/refresh_service_spec.rb | 6 | ||||
| -rw-r--r-- | spec/services/projects/fork_service_spec.rb | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/spec/services/merge_requests/refresh_service_spec.rb b/spec/services/merge_requests/refresh_service_spec.rb index 0f9b65678df..9516e7936d8 100644 --- a/spec/services/merge_requests/refresh_service_spec.rb +++ b/spec/services/merge_requests/refresh_service_spec.rb @@ -13,12 +13,14 @@ describe MergeRequests::RefreshService do @project = create(:project, namespace: group) @fork_project = Projects::ForkService.new(@project, @user).execute - @merge_request = create(:merge_request, source_project: @project, + @merge_request = create(:merge_request, + source_project: @project, source_branch: 'master', target_branch: 'feature', target_project: @project) - @fork_merge_request = create(:merge_request, source_project: @fork_project, + @fork_merge_request = create(:merge_request, + source_project: @fork_project, source_branch: 'master', target_branch: 'feature', target_project: @project) diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb index f158ac87e2b..439a492cea9 100644 --- a/spec/services/projects/fork_service_spec.rb +++ b/spec/services/projects/fork_service_spec.rb @@ -5,8 +5,10 @@ describe Projects::ForkService do before do @from_namespace = create(:namespace) @from_user = create(:user, namespace: @from_namespace ) - @from_project = create(:project, creator_id: @from_user.id, - namespace: @from_namespace, star_count: 107, + @from_project = create(:project, + creator_id: @from_user.id, + namespace: @from_namespace, + star_count: 107, description: 'wow such project') @to_namespace = create(:namespace) @to_user = create(:user, namespace: @to_namespace) |