diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-14 15:34:13 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-14 15:34:13 +0000 |
| commit | 425c2c90c4515bb6b26cee1e8748f68796b2dc26 (patch) | |
| tree | aab7d3dddef6c23deac3e552044952b7ad81fe00 /spec/controllers/services_controller_spec.rb | |
| parent | 1555a395957f6d1208980509efb9bc989443a063 (diff) | |
| parent | 1fd7af51c8e5ce744631334a1af7ea8f61d4239b (diff) | |
Merge branch 'release/0.16' into rails-3-develop
Diffstat (limited to 'spec/controllers/services_controller_spec.rb')
| -rw-r--r-- | spec/controllers/services_controller_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/services_controller_spec.rb b/spec/controllers/services_controller_spec.rb index 399f48acb..14731f090 100644 --- a/spec/controllers/services_controller_spec.rb +++ b/spec/controllers/services_controller_spec.rb @@ -58,7 +58,7 @@ describe ServicesController, "when returning a message for people in other count FakeWeb.register_uri(:get, %r|denmark.com|, :body => "DK") get :other_country_message response.should be_success - response.body.should == 'Hello! We have an <a href="/help/alaveteli?country_name=Deutschland">important message</a> for visitors outside Deutschland <span class="close-button">X</span>' + response.body.should == 'Hello! We have an <a href="/help/alaveteli?country_name=Deutschland">important message</a> for visitors outside Deutschland' end it "should default to no message if the country_from_ip domain doesn't exist" do AlaveteliConfiguration.stub!(:gaze_url).and_return('http://12123sdf14qsd.com') |