diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-14 15:11:08 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-14 15:17:07 +0000 |
| commit | 60be03575a78410e7e82e0d39125d5ac07282358 (patch) | |
| tree | b70f9f8b709b805c572d96a5fc31aa9964eea5ea /spec/controllers/services_controller_spec.rb | |
| parent | 960ad7e765ecfa49b114e2bb1ad024ffdf74c82b (diff) | |
| parent | b735f9fdbf5016b52faadde754631d4475500831 (diff) | |
Merge branch 'feature/cleanup-popups' into release/0.16
Conflicts:
Gemfile.lock
app/views/layouts/default.html.erb
config/application.rb
public/admin/stylesheets/admin.css
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') |