Merge pull request #14398 from code-dot-org/staging

DTT (Staging > Test)
code-dot-org · Apr 14, 2017 · fdb4664 · fdb4664
2 parents 7d2fbba + a24053b
commit fdb4664
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 89 deletions.
diff --git a/bin/cron/admin_progress b/bin/cron/admin_progress
diff --git a/dashboard/app/controllers/admin_reports_controller.rb b/dashboard/app/controllers/admin_reports_controller.rb
@@ -150,22 +150,6 @@ def pd_progress
     end
   end
 
-  def admin_progress
-    SeamlessDatabasePool.use_persistent_read_connection do
-      stats = Properties.get(:admin_progress)
-      if stats.present?
-        @user_count = stats['user_count']
-        @levels_attempted = stats['levels_attempted']
-        @levels_attempted.default = 0
-        @levels_passed = stats['levels_passed']
-        @levels_passed.default = 0
-
-        @all_script_levels = Script.twenty_hour_script.script_levels.includes({level: :game})
-        @stage_map = @all_script_levels.group_by {|sl| sl.level.game}
-      end
-    end
-  end
-
   # Use callbacks to share common setup or constraints between actions.
   def set_script
     @script = Script.get_from_cache(params[:script_id]) if params[:script_id]

diff --git a/dashboard/app/views/admin_reports/admin_progress.html.haml b/dashboard/app/views/admin_reports/admin_progress.html.haml
diff --git a/dashboard/app/views/admin_reports/directory.html.haml b/dashboard/app/views/admin_reports/directory.html.haml
@@ -1,9 +1,6 @@
 %h1 Directory of Admin Dashboards
 
 %h3 Code Studio Progress
-= link_to admin_progress_path do
-  Admin Progress
-%br
 = link_to level_completions_path do
   Level Completion
 %br

diff --git a/dashboard/config/routes.rb b/dashboard/config/routes.rb
@@ -212,7 +212,6 @@ module OPS
   get '/admin/levels', to: 'admin_reports#level_completions', as: 'level_completions'
   get '/admin/level_answers(.:format)', to: 'admin_reports#level_answers', as: 'level_answers'
   get '/admin/pd_progress(/:script)', to: 'admin_reports#pd_progress', as: 'pd_progress'
-  get '/admin/progress', to: 'admin_reports#admin_progress', as: 'admin_progress'
   get '/admin/debug', to: 'admin_reports#debug'
 
   # internal search tools

diff --git a/dashboard/test/controllers/admin_reports_controller_test.rb b/dashboard/test/controllers/admin_reports_controller_test.rb
@@ -7,16 +7,10 @@ class AdminReportsControllerTest < ActionController::TestCase
     sign_in create(:admin)
   end
 
-  generate_admin_only_tests_for :admin_progress
   generate_admin_only_tests_for :debug
   generate_admin_only_tests_for :directory
   generate_admin_only_tests_for :level_answers
 
-  test 'should get admin progress page' do
-    get :admin_progress
-    assert_select 'h1', 'Admin progress'
-  end
-
   test 'pd_progress should return 404 for unfound script' do
     get :pd_progress, params: {script: 'bogus-nonexistent-script-name'}
     assert_response :not_found