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

1 files changed, 10 insertions, 0 deletions

diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb
index 1d8e3dcc3..b09594b9c 100644
--- a/spec/controllers/user_controller_spec.rb
+++ b/spec/controllers/user_controller_spec.rb
@@ -66,6 +66,11 @@ end
 describe UserController, "when signing in" do
     render_views
 
+    before do
+        # Don't call out to external url during tests
+        controller.stub!(:country_from_ip).and_return('gb')
+    end
+
     def get_last_postredirect
         post_redirects = PostRedirect.find_by_sql("select * from post_redirects order by id desc limit 1")
         post_redirects.size.should == 1
@@ -226,6 +231,11 @@ end
 describe UserController, "when signing up" do
     render_views
 
+    before do
+        # Don't call out to external url during tests
+        controller.stub!(:country_from_ip).and_return('gb')
+    end
+
     it "should be an error if you type the password differently each time" do
         post :signup, { :user_signup => { :email => 'new@localhost', :name => 'New Person',
             :password => 'sillypassword', :password_confirmation => 'sillypasswordtwo' }