Make all controllers in admin/ inherit AdminController

Author: bmarkons

app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,4 @@
+class Admin::DashboardController < AdminController
+  def dashboard
+  end
+end

app/controllers/admin/groups_controller.rb

@@ -1,12 +1,4 @@
-class Admin::GroupsController < ApplicationController
-  http_basic_authenticate_with(
-    name: 'admin',
-    password: Rails.application.secrets.admin_password
-  ) unless Rails.env.test?
-
-  layout 'admin'
-
-  before_action :set_repos, :set_admin
+class Admin::GroupsController < AdminController
   before_action :set_group, only: [:show, :edit, :update, :destroy]
 
   def index

app/controllers/admin/repos_controller.rb

@@ -0,0 +1,21 @@
+class Admin::ReposController < AdminController
+  before_action :set_repo
+
+  def show
+  end
+
+  def run_commits
+    ManualRunner.new(@repo).run_last(
+      params[:count].to_i,
+      pattern: params[:pattern] == 'all' ? '' : params[:pattern]
+    )
+
+    redirect_to admin_repo_path(@repo.name), notice: "#{@repo.name.capitalize} suite is running for last #{params[:count].to_i} commits."
+  end
+
+  private
+
+  def set_repo
+    @repo = Repo.find_by(name: params[:repo_name])
+  end
+end

app/controllers/admin_controller.rb

@@ -7,34 +7,14 @@ class AdminController < ApplicationController
   layout 'admin'
 
   before_action :set_repos, :set_admin
-  before_action :set_repo, only: [:repo, :run]
+
+  private
 
   def set_admin
     session['admin'] = true unless session['admin'] || Rails.env.test?
   end
 
-  def home
-  end
-
-  def repo
-  end
-
-  def run
-    ManualRunner.new(@repo).run_last(
-      params[:count].to_i,
-      pattern: params[:pattern] == 'all' ? '' : params[:pattern]
-    )
-
-    redirect_to admin_repo_path(@repo.name), notice: "#{@repo.name.capitalize} suite is running for last #{params[:count].to_i} commits."
-  end
-
-  private
-
   def set_repos
     @repos = Repo.all
   end
-
-  def set_repo
-    @repo = Repo.find_by(name: params[:repo_name])
-  end
 end

app/views/admin/home.html.haml …iews/admin/dashboard/dashboard.html.hamlapp/views/admin/home.html.haml renamed to app/views/admin/dashboard/dashboard.html.haml app/views/admin/home.html.haml renamed to app/views/admin/dashboard/dashboard.html.haml

@@ -12,7 +12,7 @@
 
     .panel.panel-warning
       .panel-body
-        = form_tag(admin_repo_run_path(@repo.name), id: 'manual_run_form') do
+        = form_tag(admin_run_commits_path(@repo.name), id: 'manual_run_form') do
           .form-group
             = label_tag(t('admin.manual_run_pattern_label'))
             = text_field_tag(:pattern, 'all', class: 'form-control')

app/views/admin/repo.html.haml app/views/admin/repos/show.html.hamlapp/views/admin/repo.html.haml renamed to app/views/admin/repos/show.html.haml

@@ -16,7 +16,7 @@
     .sidebar-nav.navbar-collapse
       %ul#side-menu.nav.in
         %li
-          = link_to admin_path do
+          = link_to admin_dashboard_path do
             %i.fa.fa-dashboard.fa-fw
             = t('admin.dashboard')
         %li

app/views/layouts/admin/_navbar.html.haml

@@ -23,12 +23,11 @@
   get ':organization_name/:repo_name/commits' => 'repos#commits', as: :commits
   get ':organization_name/:repo_name/releases' => 'repos#releases', as: :releases
 
-  get 'admin' => 'admin#home'
-  get 'admin/repos/:repo_name' => 'admin#repo', as: :admin_repo
-  get 'admin/toggle' => 'admin#toggle_admin'
-  post 'admin/repos/:repo_name/run' => 'admin#run', as: :admin_repo_run
-
   namespace :admin do
     resources :groups, except: [:show]
+
+    get '' => 'dashboard#dashboard', as: :dashboard
+    get 'repos/:repo_name' => 'repos#show', as: :repo
+    post 'repos/:repo_name/run_commits' => 'repos#run_commits', as: :run_commits
   end
 end

config/routes.rb

@@ -7,6 +7,6 @@ def test_running_commits_manually
 
     ManualRunner.any_instance.expects(:run_last).with(100, pattern: pattern)
 
-    post(admin_repo_run_path(@repo.name), params: { count: 100, pattern: pattern })
+    post(admin_run_commits_path(@repo.name), params: { count: 100, pattern: pattern })
   end
 end