diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-23 13:40:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-23 13:40:34 +0000 |
| commit | 3ac224e673761936d81d956d98063ed502ce4251 (patch) | |
| tree | 10dc941d0cc2aaa59991a7b350350c45f7151080 | |
| parent | 3a54128d1f1ac1fa0779fe7309bd043ffa947ab5 (diff) | |
| parent | a92c0f9c116a2d16106a8be4e802fc7dbb826e2f (diff) | |
| download | gitlab-ce-3ac224e673761936d81d956d98063ed502ce4251.tar.gz | |
Merge branch 'use-archived-trait' into 'master'
Use archived trait for project in specs instead model column
See merge request !8635
| -rw-r--r-- | spec/features/admin/admin_projects_spec.rb | 2 | ||||
| -rw-r--r-- | spec/features/groups/merge_requests_spec.rb | 2 | ||||
| -rw-r--r-- | spec/finders/merge_requests_finder_spec.rb | 2 | ||||
| -rw-r--r-- | spec/finders/move_to_project_finder_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb index a5b88812b75..87a8f62687a 100644 --- a/spec/features/admin/admin_projects_spec.rb +++ b/spec/features/admin/admin_projects_spec.rb @@ -10,7 +10,7 @@ describe "Admin::Projects", feature: true do end describe "GET /admin/projects" do - let!(:archived_project) { create :project, :public, archived: true } + let!(:archived_project) { create :project, :public, :archived } before do visit admin_projects_path diff --git a/spec/features/groups/merge_requests_spec.rb b/spec/features/groups/merge_requests_spec.rb index 30b80aa82b0..78a11ffee99 100644 --- a/spec/features/groups/merge_requests_spec.rb +++ b/spec/features/groups/merge_requests_spec.rb @@ -7,7 +7,7 @@ feature 'Group merge requests page', feature: true do include_examples 'project features apply to issuables', MergeRequest context 'archived issuable' do - let(:project_archived) { create(:project, group: group, merge_requests_access_level: ProjectFeature::ENABLED, archived: true) } + let(:project_archived) { create(:project, :archived, group: group, merge_requests_access_level: ProjectFeature::ENABLED) } let(:issuable_archived) { create(:merge_request, source_project: project_archived, target_project: project_archived, title: 'issuable of an archived project') } let(:access_level) { ProjectFeature::ENABLED } let(:user) { user_in_group } diff --git a/spec/finders/merge_requests_finder_spec.rb b/spec/finders/merge_requests_finder_spec.rb index 88361e27102..e4ba1d2f1c2 100644 --- a/spec/finders/merge_requests_finder_spec.rb +++ b/spec/finders/merge_requests_finder_spec.rb @@ -6,7 +6,7 @@ describe MergeRequestsFinder do let(:project1) { create(:project) } let(:project2) { create(:project, forked_from_project: project1) } - let(:project3) { create(:project, forked_from_project: project1, archived: true) } + let(:project3) { create(:project, :archived, forked_from_project: project1) } let!(:merge_request1) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1) } let!(:merge_request2) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project1, state: 'closed') } diff --git a/spec/finders/move_to_project_finder_spec.rb b/spec/finders/move_to_project_finder_spec.rb index 8488dbd2a16..dea87980e25 100644 --- a/spec/finders/move_to_project_finder_spec.rb +++ b/spec/finders/move_to_project_finder_spec.rb @@ -36,7 +36,7 @@ describe MoveToProjectFinder do it 'does not return archived projects' do reporter_project.team << [user, :reporter] - reporter_project.update_attributes(archived: true) + reporter_project.archive! other_reporter_project = create(:empty_project) other_reporter_project.team << [user, :reporter] |