Merge pull request #6333 from bgeuken/drop_staging_identifier

Drop staging identifier
openSUSE · Nov 21, 2018 · 53eb602 · 53eb602
2 parents b6e9035 + c345bb5
commit 53eb602
Show file tree

Hide file tree

Showing 7 changed files with 75 additions and 15 deletions.
diff --git a/src/api/app/models/staging/staging_project.rb b/src/api/app/models/staging/staging_project.rb
@@ -14,10 +14,6 @@ class StagingProject < Project
     after_destroy :update_staging_workflow_on_backend
     before_create :add_managers_group
 
-    def staging_identifier
-      name[/.*:Staging:(.*)/, 1]
-    end
-
     def classified_requests
       requests = (requests_to_review | staged_requests.includes(:reviews)).map do |request|
         {

diff --git a/src/api/app/views/webui2/webui/staging/workflows/_empty_projects_list.html.haml b/src/api/app/views/webui2/webui/staging/workflows/_empty_projects_list.html.haml
@@ -4,4 +4,4 @@
   %ul.pl-4
     - projects.sort.each do |project|
       %li
-        = link_to(project.staging_identifier, staging_workflow_staging_project_path(staging_workflow, project.name))
+        = link_to(project.name, staging_workflow_staging_project_path(staging_workflow, project.name))
diff --git a/src/api/app/views/webui2/webui/staging/workflows/_overall_state.html.haml b/src/api/app/views/webui2/webui/staging/workflows/_overall_state.html.haml
@@ -1,6 +1,6 @@
 %span.badge{ class: "state-#{staging_project.overall_state}" }
   %span.badge.badge-light
-    = link_to(staging_project.staging_identifier, staging_workflow_staging_project_path(staging_workflow, staging_project.name))
+    = link_to(staging_project.name, staging_workflow_staging_project_path(staging_workflow, staging_project.name))
   %span
     %br
     = staging_project.overall_state

diff --git a/.../when_there_are_failed_checks/1_4_5_1.yml → .../when_there_are_failed_checks/1_3_5_1.yml b/.../when_there_are_failed_checks/1_4_5_1.yml → .../when_there_are_failed_checks/1_3_5_1.yml
diff --git a/...cassettes/Staging_StagingProject/_overall_state/when_there_are_missing_checks/1_3_3_1.yml b/...cassettes/Staging_StagingProject/_overall_state/when_there_are_missing_checks/1_3_3_1.yml
diff --git a/...cassettes/Staging_StagingProject/_overall_state/when_there_are_pending_checks/1_3_4_1.yml b/...cassettes/Staging_StagingProject/_overall_state/when_there_are_pending_checks/1_3_4_1.yml
diff --git a/src/api/spec/models/staging/staging_project_spec.rb b/src/api/spec/models/staging/staging_project_spec.rb
@@ -67,14 +67,6 @@
     end
   end
 
-  describe '#staging_identifier' do
-    before do
-      staging_project.update(name: 'openSUSE_41:Staging:myStagingProject')
-    end
-
-    it { expect(staging_project.staging_identifier).to eq('myStagingProject') }
-  end
-
   describe '#untracked_requests' do
     let!(:request_with_review) do
       create(:review_bs_request_by_project, request_attributes.merge(reviewer: user, review_by_project: staging_project))