Use Projects::UpdateService to archive projects

System hooks were not being triggered when projects were archived or
unarchived. Reuse the Projects::UpdateService to automatically
trigger system hooks and increase code reuse.

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/features/explore/groups_list_spec.rb b/spec/features/explore/groups_list_spec.rb
index ad02b454aee..8ed4051856e 100644
--- a/spec/features/explore/groups_list_spec.rb
+++ b/spec/features/explore/groups_list_spec.rb
@@ -53,14 +53,14 @@ describe 'Explore Groups page', :js do
     expect(find('.js-groups-list-holder .content-list li:first-child .stats .number-projects')).to have_text("1")
 
     # Archive project
-    empty_project.archive!
+    ::Projects::UpdateService.new(empty_project, user, archived: true).execute
     visit explore_groups_path
 
     # Check project count
     expect(find('.js-groups-list-holder .content-list li:first-child .stats .number-projects')).to have_text("0")
 
     # Unarchive project
-    empty_project.unarchive!
+    ::Projects::UpdateService.new(empty_project, user, archived: false).execute
     visit explore_groups_path
 
     # Check project count
diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index 97d8776b15a..176f4a668ff 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -52,6 +52,7 @@ describe 'Group issues page' do
   context 'issues list', :nested_groups do
     let(:subgroup) { create(:group, parent: group) }
     let(:subgroup_project) { create(:project, :public, group: subgroup)}
+    let(:user_in_group) { create(:group_member, :maintainer, user: create(:user), group: group ).user }
     let!(:issue) { create(:issue, project: project, title: 'root group issue') }
     let!(:subgroup_issue) { create(:issue, project: subgroup_project, title: 'subgroup issue') }
 
@@ -67,7 +68,7 @@ describe 'Group issues page' do
 
     context 'when project is archived' do
       before do
-        project.archive!
+        ::Projects::UpdateService.new(project, user_in_group, archived: true).execute
       end
 
       it 'does not render issue' do