correct failing specs

This commit is contained in:
Sam 2013-07-08 12:25:38 +10:00
parent 3dbb4ff9bc
commit 91238af6f1
2 changed files with 11 additions and 11 deletions

View File

@ -1,19 +1,13 @@
class Admin::DashboardController < Admin::AdminController
def index
# see https://github.com/rails/rails/issues/8167
# TODO: after upgrading to Rails 4, try to remove "if cache_classes"
if Discourse::Application.config.cache_classes
dashboard_data = Rails.cache.fetch("admin-dashboard-data-#{Discourse::VERSION::STRING}", expires_in: 1.hour) do
AdminDashboardData.fetch_all.as_json
end
render json: dashboard_data
else
render_json_dump AdminDashboardData.fetch_all
dashboard_data = Rails.cache.fetch("admin-dashboard-data-#{Discourse::VERSION::STRING}", expires_in: 1.hour) do
AdminDashboardData.fetch_all.as_json
end
render json: dashboard_data
end
def problems
render_json_dump({problems: AdminDashboardData.fetch_problems})
end
end
end

View File

@ -1,6 +1,12 @@
require 'spec_helper'
require_dependency 'discourse_version_check'
describe Admin::DashboardController do
before do
#NOTE: Rails.cache should be blanked between tests, at the moment we can share state with it
# that is seriously bust on quite a few levels
Rails.cache.delete("admin-dashboard-data-#{Discourse::VERSION::STRING}")
end
it "is a subclass of AdminController" do
(Admin::DashboardController < Admin::AdminController).should be_true
@ -81,4 +87,4 @@ describe Admin::DashboardController do
end
end
end
end
end