github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-06 03:06:53 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse

Browse Source 
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
This commit is contained in:
Robin Ward
2013-02-26 10:42:49 -05:00
parent a42637eb73 cafc75b238
commit 1221c393a3
383 changed files with 4225 additions and 2226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/controllers/robots_txt_controller_spec.rb
View File

@ -10,13 +10,13 @@ describe RobotsTxtController do
response.should render_template :index
end
it "returns noindex when indexing is disallowed" do
it "returns noindex when indexing is disallowed" do
SiteSetting.stubs(:allow_index_in_robots_txt).returns(false)
get :index
response.should render_template :no_index
end
it "serves noindex when in private mode regardless of the configuration" do
end
it "serves noindex when in private mode regardless of the configuration" do
SiteSetting.stubs(:allow_index_in_robots_txt).returns(true)
SiteSetting.stubs(:restrict_access).returns(true)
get :index