Merge pull request #6620 from vpereira/meta_controller_spec

Refactor Meta controller related specs
openSUSE · Dec 19, 2018 · be68942 · be68942
2 parents 5bd21f9 + 4a574ed
commit be68942
Show file tree

Hide file tree

Showing 12 changed files with 74 additions and 463 deletions.
diff --git a/src/api/app/controllers/webui/projects/meta_controller.rb b/src/api/app/controllers/webui/projects/meta_controller.rb
@@ -12,8 +12,7 @@ def show
 
       def update
         authorize @project, :update?
-        updater = ::MetaControllerService::ProjectUpdater.new(project: @project, request_data: @request_data)
-        updater.call
+        updater = ::MetaControllerService::ProjectUpdater.new(project: @project, request_data: @request_data).call
 
         status = if updater.valid?
                    flash.now[:success] = 'Config successfully saved!'

diff --git a/src/api/app/services/meta_controller_service/project_updater.rb b/src/api/app/services/meta_controller_service/project_updater.rb
@@ -10,13 +10,14 @@ def call
       @validator.call
       unless @validator.valid?
         @errors = @validator.errors
-        return
+        return self
       end
 
       Project.transaction do
         @errors = @project.update_from_xml(@request_data)[:error]
         @project.store if valid?
       end
+      self
     end
 
     def errors

diff --git a/...roller/POST_update/with_a_valid_project/with_a_non_existing_repository_path/1_2_2_4_1.yml b/...roller/POST_update/with_a_valid_project/with_a_non_existing_repository_path/1_2_2_4_1.yml
diff --git a/...roller/POST_update/with_a_valid_project/with_a_non_existing_repository_path/1_2_2_4_2.yml b/...roller/POST_update/with_a_valid_project/with_a_non_existing_repository_path/1_2_2_4_2.yml
diff --git a/..._Projects_MetaController/POST_update/with_a_valid_project/with_a_valid_meta/1_2_2_3_1.yml b/..._Projects_MetaController/POST_update/with_a_valid_project/with_a_valid_meta/1_2_2_3_1.yml
diff --git a/..._Projects_MetaController/POST_update/with_a_valid_project/with_a_valid_meta/1_2_2_3_2.yml b/..._Projects_MetaController/POST_update/with_a_valid_project/with_a_valid_meta/1_2_2_3_2.yml
diff --git a/...taController/POST_update/with_a_valid_project/with_an_invalid_devel_project/1_2_2_2_1.yml b/...taController/POST_update/with_a_valid_project/with_an_invalid_devel_project/1_2_2_2_1.yml
diff --git a/...taController/POST_update/with_a_valid_project/with_an_invalid_devel_project/1_2_2_2_2.yml b/...taController/POST_update/with_a_valid_project/with_an_invalid_devel_project/1_2_2_2_2.yml