diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-26 13:05:08 -0700 |
| commit | 27d6ad899f594bd9b79e54cdc5a3c17110f3b26c (patch) | |
| tree | b75973ee4325bd11f27220e38d1e899076948c78 /spec/controllers/general_controller_spec.rb | |
| parent | 9bbc93bfd8ba8aaaf9bd1ad9031368b7faad8239 (diff) | |
| parent | 3194a7801684d010dac94c26cf39bb780bfcd17e (diff) | |
Merge branch 'release/0.12'0.12
Conflicts:
locale/he_IL/app.po
locale/hr_HR/app.po
locale/nb_NO/app.po
locale/uk/app.po
Diffstat (limited to 'spec/controllers/general_controller_spec.rb')
| -rw-r--r-- | spec/controllers/general_controller_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/controllers/general_controller_spec.rb b/spec/controllers/general_controller_spec.rb index 4a1c8b134..0eda73c51 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 @@ -348,4 +350,3 @@ describe GeneralController, 'when using xapian search' do end end - |