From a4a18b94efcf139455165cf01b0359a479e91344 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 5 Jun 2013 14:20:07 +0100 Subject: Remove support for theme stylesheet inclusion via template deprecated in version 0.5. Closes #972. --- spec/controllers/general_controller_spec.rb | 1 - 1 file changed, 1 deletion(-) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 4a1c8b134..bce12248b 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -348,4 +348,3 @@ describe GeneralController, 'when using xapian search' do end end - -- cgit v1.2.3 From c1b3324922687778b316ee1a180582013bcf6d0e Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 20 Jun 2013 15:20:49 -0700 Subject: Assume that format will be specified in the url requested, or default to HTML. Fixes #989. --- spec/controllers/general_controller_spec.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index bce12248b..083197d24 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -347,4 +347,10 @@ describe GeneralController, 'when using xapian search' do response.body.should include('Track this search') end + it 'should ignore an odd ACCEPTS header' do + request.env['HTTP_ACCEPT'] = '*/*;q=0.01' + get :search, :combined => '"fancy dog"' + response.should be_success + end + end -- cgit v1.2.3 From 6875d9942c423c1114c7a3f9b9c27ac601599f2d Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 20 Jun 2013 16:43:53 -0700 Subject: Don't call out to external urls during controller tests --- spec/controllers/general_controller_spec.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 083197d24..61d847cec 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -21,6 +21,8 @@ describe GeneralController, 'when getting the blog feed' do before do AlaveteliConfiguration.stub!(:blog_feed).and_return("http://blog.example.com") + # Don't call out to external url during tests + controller.stub!(:quietly_try_to_open).and_return('') end it 'should add a lang param correctly to a url with no querystring' do -- cgit v1.2.3 From 9452a2e5fffd35be383250ada139b349a5866acb Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Wed, 26 Jun 2013 12:05:55 -0700 Subject: Revert "Assume that format will be specified in the url requested, or default to HTML. Fixes #989." This reverts commit c1b3324922687778b316ee1a180582013bcf6d0e. --- spec/controllers/general_controller_spec.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'spec/controllers/general_controller_spec.rb') diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 61d847cec..0eda73c51 100644 --- a/spec/controllers/general_controller_spec.rb +++ b/spec/controllers/general_controller_spec.rb @@ -349,10 +349,4 @@ describe GeneralController, 'when using xapian search' do response.body.should include('Track this search') end - it 'should ignore an odd ACCEPTS header' do - request.env['HTTP_ACCEPT'] = '*/*;q=0.01' - get :search, :combined => '"fancy dog"' - response.should be_success - end - end -- cgit v1.2.3