Introduce staging namespace in WebUI

openSUSE · Nov 13, 2018 · e415d23 · e415d23
1 parent 78d60e2
commit e415d23
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 14 deletions.
diff --git a/..._workflows/staging_projects_controller.rb → ...lers/webui/staging/projects_controller.rb b/..._workflows/staging_projects_controller.rb → ...lers/webui/staging/projects_controller.rb
@@ -1,6 +1,6 @@
 module Webui
-  module StagingWorkflows
-    class StagingProjectsController < WebuiController
+  module Staging
+    class ProjectsController < WebuiController
       layout 'webui2/webui'
 
       before_action :require_login
@@ -45,7 +45,7 @@ def destroy
       private
 
       def set_staging_workflow
-        @staging_workflow = Staging::Workflow.find(params[:staging_workflow_id])
+        @staging_workflow = ::Staging::Workflow.find(params[:staging_workflow_id])
         return if @staging_workflow
 
         redirect_back(fallback_location: root_path)

diff --git a/...ers/webui/staging_workflows_controller.rb → ...ers/webui/staging/workflows_controller.rb b/...ers/webui/staging_workflows_controller.rb → ...ers/webui/staging/workflows_controller.rb
@@ -1,4 +1,4 @@
-class Webui::StagingWorkflowsController < Webui::WebuiController
+class Webui::Staging::WorkflowsController < Webui::WebuiController
   layout 'webui2/webui'
 
   before_action :require_login, except: [:show]
@@ -47,7 +47,7 @@ def edit
   end
 
   def destroy
-    @staging_workflow = StagingWorkflow.find_by(id: params[:id])
+    @staging_workflow = ::Staging::Workflow.find_by(id: params[:id])
     authorize @staging_workflow
     @project = @staging_workflow.project
 
@@ -71,7 +71,7 @@ def set_bootstrap_views
   end
 
   def set_staging_workflow
-    @staging_workflow = Staging::Workflow.find_by(id: params[:id])
+    @staging_workflow = ::Staging::Workflow.find_by(id: params[:id])
     return if @staging_workflow
 
     redirect_back(fallback_location: root_path)

diff --git a/...i/app/policies/staging_workflow_policy.rb → ...i/app/policies/staging/workflow_policy.rb b/...i/app/policies/staging_workflow_policy.rb → ...i/app/policies/staging/workflow_policy.rb
@@ -1,4 +1,4 @@
-class StagingWorkflowPolicy < ApplicationPolicy
+class Staging::WorkflowPolicy < ApplicationPolicy
   def initialize(user, record)
     raise Pundit::NotAuthorizedError, 'staging workflow does not exist' unless record
     @user = user

diff --git a/...ing_workflows/_breadcrumb_items.html.haml → ...ing/workflows/_breadcrumb_items.html.haml b/...ing_workflows/_breadcrumb_items.html.haml → ...ing/workflows/_breadcrumb_items.html.haml
@@ -7,7 +7,7 @@
     Create Staging Projects
 - else
   %li.breadcrumb-item
-    = link_to 'Staging Projects', staging_workflow_path(@staging_workflow)
+    = link_to 'Staging Projects', staging_workflows_path(@staging_workflow)
   - if controller_name == 'staging_workflows' && action_name == 'edit'
     %li.breadcrumb-item.active{ 'aria-current' => 'page' }
       Edit
diff --git a/...rkflows/_create_staging_project.html.haml → ...rkflows/_create_staging_project.html.haml b/...rkflows/_create_staging_project.html.haml → ...rkflows/_create_staging_project.html.haml
diff --git a/...webui/staging_workflows/_delete.html.haml → ...webui/staging/workflows/_delete.html.haml b/...webui/staging_workflows/_delete.html.haml → ...webui/staging/workflows/_delete.html.haml
diff --git a/...s/_delete_staging_project_modal.html.haml → ...s/_delete_staging_project_modal.html.haml b/...s/_delete_staging_project_modal.html.haml → ...s/_delete_staging_project_modal.html.haml
diff --git a/...aging_workflows/_empty_projects_list.haml → ...aging/workflows/_empty_projects_list.haml b/...aging_workflows/_empty_projects_list.haml → ...aging/workflows/_empty_projects_list.haml
diff --git a/.../webui/staging_workflows/_infos.html.haml → .../webui/staging/workflows/_infos.html.haml b/.../webui/staging_workflows/_infos.html.haml → .../webui/staging/workflows/_infos.html.haml
diff --git a/...webui/staging_workflows/_legend.html.haml → ...webui/staging/workflows/_legend.html.haml b/...webui/staging_workflows/_legend.html.haml → ...webui/staging/workflows/_legend.html.haml
diff --git a/...taging_workflows/_overall_state.html.haml → ...taging/workflows/_overall_state.html.haml b/...taging_workflows/_overall_state.html.haml → ...taging/workflows/_overall_state.html.haml
diff --git a/...taging_workflows/_packages_list.html.haml → ...taging/workflows/_packages_list.html.haml b/...taging_workflows/_packages_list.html.haml → ...taging/workflows/_packages_list.html.haml
diff --git a/...bui/staging_workflows/_problems.html.haml → ...bui/staging/workflows/_problems.html.haml b/...bui/staging_workflows/_problems.html.haml → ...bui/staging/workflows/_problems.html.haml
diff --git a/...bui/staging_workflows/_requests_list.haml → ...bui/staging/workflows/_requests_list.haml b/...bui/staging_workflows/_requests_list.haml → ...bui/staging/workflows/_requests_list.haml
diff --git a/...i2/webui/staging_workflows/edit.html.haml → ...i2/webui/staging/workflows/edit.html.haml b/...i2/webui/staging_workflows/edit.html.haml → ...i2/webui/staging/workflows/edit.html.haml
diff --git a/...ui2/webui/staging_workflows/new.html.haml → ...ui2/webui/staging/workflows/new.html.haml b/...ui2/webui/staging_workflows/new.html.haml → ...ui2/webui/staging/workflows/new.html.haml
diff --git a/...i2/webui/staging_workflows/show.html.haml → ...i2/webui/staging/workflows/show.html.haml b/...i2/webui/staging_workflows/show.html.haml → ...i2/webui/staging/workflows/show.html.haml
@@ -13,7 +13,7 @@
               %i.fas.fa-edit.text-info
               Edit Staging Workflow
           - if policy(@staging_workflow).destroy?
-            = render(partial: 'webui2/webui/staging_workflows/delete', locals: { project: @project })
+            = render(partial: 'webui2/webui/staging/workflows/delete', locals: { project: @project })
         %hr
 
         %table.table.table-striped.table-bordered.table-sm.dt-responsive.w-100#staging-projects-datatable

diff --git a/...flows/staging_projects_controller_spec.rb → ...webui/staging/projects_controller_spec.rb b/...flows/staging_projects_controller_spec.rb → ...webui/staging/projects_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webui::StagingWorkflows::StagingProjectsController do
+RSpec.describe Webui::Staging::ProjectsController do
   let(:user) { create(:confirmed_user, login: 'tom') }
   let(:project) { user.home_project }
   let(:staging_workflow) { project.create_staging }

diff --git a/...ebui/staging_workflows_controller_spec.rb → ...ebui/staging/workflows_controller_spec.rb b/...ebui/staging_workflows_controller_spec.rb → ...ebui/staging/workflows_controller_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe Webui::StagingWorkflowsController do
+RSpec.describe Webui::Staging::WorkflowsController do
   let(:user) { create(:confirmed_user, login: 'tom') }
   let(:project) { user.home_project }
 
@@ -128,7 +128,7 @@
 
       subject { project.staging }
 
-      it { expect(StagingWorkflow.count).to eq(0) }
+      it { expect(Staging::Workflow.count).to eq(0) }
       it { expect(subject.staging_projects.count).to eq(0) }
       it { expect(flash[:success]).not_to be_nil }
       it { expect(response.body).to eq("window.location='#{project_show_path(project)}'") }
@@ -144,7 +144,7 @@
 
       subject { project.staging }
 
-      it { expect(StagingWorkflow.count).to eq(0) }
+      it { expect(Staging::Workflow.count).to eq(0) }
       it { expect(subject.staging_projects.count).to eq(0) }
       it { expect(project.subprojects.count).to eq(1) }
       it { expect(flash[:success]).not_to be_nil }
@@ -154,7 +154,7 @@
     context 'a staging workflow unsuccessful' do
       before do
         project.create_staging
-        allow_any_instance_of(StagingWorkflow).to receive(:destroy).and_return(false)
+        allow_any_instance_of(Staging::Workflow).to receive(:destroy).and_return(false)
         params = { id: project.staging, staging_project_ids: project.staging.staging_projects.ids, format: :js }
         delete :destroy, params: params
       end