diff options
author | Felipe Artur <felipefac@gmail.com> | 2019-03-28 11:31:14 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2019-03-28 11:31:14 -0300 |
commit | b2fb3a9c62862476a7591ecb5ab4a6a3146e0c49 (patch) | |
tree | 8442a290e6071748b4da62e2761365feca49dc40 /spec/migrations | |
parent | 16a3fea3998e813b95d7d09ea31f6a88dc908102 (diff) | |
download | gitlab-ce-b2fb3a9c62862476a7591ecb5ab4a6a3146e0c49.tar.gz |
Address review comments
Diffstat (limited to 'spec/migrations')
-rw-r--r-- | spec/migrations/schedule_sync_issuables_state_id_spec.rb | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/spec/migrations/schedule_sync_issuables_state_id_spec.rb b/spec/migrations/schedule_sync_issuables_state_id_spec.rb index 6b1ea804342..bf974d60b24 100644 --- a/spec/migrations/schedule_sync_issuables_state_id_spec.rb +++ b/spec/migrations/schedule_sync_issuables_state_id_spec.rb @@ -9,11 +9,8 @@ describe ScheduleSyncIssuablesStateId, :migration do let(:merge_requests) { table(:merge_requests) } let(:issues) { table(:issues) } let(:migration) { described_class.new } - - before do - @group = namespaces.create!(name: 'gitlab', path: 'gitlab') - @project = projects.create!(namespace_id: @group.id) - end + let(:group) { namespaces.create!(name: 'gitlab', path: 'gitlab') } + let(:project) { projects.create!(namespace_id: group.id) } shared_examples 'scheduling migrations' do before do @@ -40,14 +37,12 @@ describe ScheduleSyncIssuablesStateId, :migration do opened_issue = issues.create!(description: 'first', state: 'opened') closed_issue = issues.create!(description: 'second', state: 'closed') invalid_state_issue = issues.create!(description: 'fourth', state: 'not valid') - nil_state_issue = issues.create!(description: 'third', state: nil) migrate! expect(opened_issue.reload.state_id).to eq(Issue.available_states[:opened]) expect(closed_issue.reload.state_id).to eq(Issue.available_states[:closed]) expect(invalid_state_issue.reload.state_id).to be_nil - expect(nil_state_issue.reload.state_id).to be_nil end it_behaves_like 'scheduling migrations' do @@ -61,11 +56,10 @@ describe ScheduleSyncIssuablesStateId, :migration do context 'merge requests' do it 'migrates state column to integer' do - opened_merge_request = merge_requests.create!(state: 'opened', target_project_id: @project.id, target_branch: 'feature1', source_branch: 'master') - closed_merge_request = merge_requests.create!(state: 'closed', target_project_id: @project.id, target_branch: 'feature2', source_branch: 'master') - merged_merge_request = merge_requests.create!(state: 'merged', target_project_id: @project.id, target_branch: 'feature3', source_branch: 'master') - locked_merge_request = merge_requests.create!(state: 'locked', target_project_id: @project.id, target_branch: 'feature4', source_branch: 'master') - invalid_state_merge_request = merge_requests.create!(state: 'not valid', target_project_id: @project.id, target_branch: 'feature5', source_branch: 'master') + opened_merge_request = merge_requests.create!(state: 'opened', target_project_id: project.id, target_branch: 'feature1', source_branch: 'master') + closed_merge_request = merge_requests.create!(state: 'closed', target_project_id: project.id, target_branch: 'feature2', source_branch: 'master') + merged_merge_request = merge_requests.create!(state: 'merged', target_project_id: project.id, target_branch: 'feature3', source_branch: 'master') + locked_merge_request = merge_requests.create!(state: 'locked', target_project_id: project.id, target_branch: 'feature4', source_branch: 'master') migrate! @@ -73,15 +67,14 @@ describe ScheduleSyncIssuablesStateId, :migration do expect(closed_merge_request.reload.state_id).to eq(MergeRequest.available_states[:closed]) expect(merged_merge_request.reload.state_id).to eq(MergeRequest.available_states[:merged]) expect(locked_merge_request.reload.state_id).to eq(MergeRequest.available_states[:locked]) - expect(invalid_state_merge_request.reload.state_id).to be_nil end it_behaves_like 'scheduling migrations' do let(:migration) { described_class::MERGE_REQUESTS_MIGRATION } - let!(:resource_1) { merge_requests.create!(state: 'opened', target_project_id: @project.id, target_branch: 'feature1', source_branch: 'master') } - let!(:resource_2) { merge_requests.create!(state: 'closed', target_project_id: @project.id, target_branch: 'feature2', source_branch: 'master') } - let!(:resource_3) { merge_requests.create!(state: 'merged', target_project_id: @project.id, target_branch: 'feature3', source_branch: 'master') } - let!(:resource_4) { merge_requests.create!(state: 'locked', target_project_id: @project.id, target_branch: 'feature4', source_branch: 'master') } + let!(:resource_1) { merge_requests.create!(state: 'opened', target_project_id: project.id, target_branch: 'feature1', source_branch: 'master') } + let!(:resource_2) { merge_requests.create!(state: 'closed', target_project_id: project.id, target_branch: 'feature2', source_branch: 'master') } + let!(:resource_3) { merge_requests.create!(state: 'merged', target_project_id: project.id, target_branch: 'feature3', source_branch: 'master') } + let!(:resource_4) { merge_requests.create!(state: 'locked', target_project_id: project.id, target_branch: 'feature4', source_branch: 'master') } end end end |