Second review fixes

app/controllers/topics_controller.rb

@@ -72,7 +72,7 @@ class TopicsController < ApplicationController
     if opts[:print]
       raise Discourse::InvalidAccess unless SiteSetting.max_prints_per_hour_per_user > 0
       begin
-        RateLimiter.new(current_user, "print-topic-per-hour", 10, 1.hour).performed! unless @guardian.is_admin?
+        RateLimiter.new(current_user, "print-topic-per-hour", SiteSetting.max_prints_per_hour_per_user, 1.hour).performed! unless @guardian.is_admin?
       rescue RateLimiter::LimitExceeded
         render_json_error(I18n.t("rate_limiter.slow_down"))
       end

config/site_settings.yml

@@ -910,7 +910,7 @@ rate_limits:
     shadowed_by_global: true
     default: 0
   max_prints_per_hour_per_user:
-    default: 0
+    default: 5
     client: true
 
 developer:

lib/topic_view.rb

@@ -137,11 +137,7 @@ class TopicView
   end
 
   def relative_url
-    if !@print
+    "#{@topic.relative_url}#{@print ? '/print' : ''}"
-      @topic.relative_url
-    else
-      @topic.relative_url + '/print'
-    end
   end
 
   def page_title

spec/controllers/application_controller_spec.rb

@@ -88,10 +88,6 @@ describe TopicsController do
     render_views
 
     context "when the SiteSetting is enabled" do
-      before do
-        SiteSetting.stubs(:max_prints_per_hour_per_user).returns(10)
-      end
-
       it "uses the application layout when there's no param" do
         get :show, topic_id: topic.id, slug: topic.slug
         expect(response).to render_template(layout: 'application')

spec/controllers/topics_controller_spec.rb

@@ -747,20 +747,19 @@ describe TopicsController do
       expect(IncomingLink.count).to eq(1)
     end
 
-    it "doesn't renders the print view by default" do
+    context 'print' do
-      user = Fabricate(:user)
-      get :show, topic_id: topic.id, slug: topic.slug, print: true
 
-      expect(response).to be_forbidden
+      it "doesn't renders the print view when disabled" do
-    end
+        SiteSetting.max_prints_per_hour_per_user = 0
+        get :show, topic_id: topic.id, slug: topic.slug, print: true
+        expect(response).to be_forbidden
+      end
 
-    it 'renders the print view when enabled' do
+      it 'renders the print view when enabled' do
-      SiteSetting.max_prints_per_hour_per_user = 10
+        SiteSetting.max_prints_per_hour_per_user = 10
-
+        get :show, topic_id: topic.id, slug: topic.slug, print: true
-      user = Fabricate(:user)
+        expect(response).to be_successful
-      get :show, topic_id: topic.id, slug: topic.slug, print: true
+      end
-
-      expect(response).to be_successful
     end
 
     it 'records redirects' do