Merge remote-tracking branch 'origin/develop'

Conflicts:
	app/assets/javascripts/srp
	test/nagios/soledad_sync.py
	test/nagios/webapp_login.py

1 files changed, 0 insertions, 33 deletions

diff --git a/users/test/functional/webfinger_controller_test.rb b/users/test/functional/webfinger_controller_test.rb
deleted file mode 100644
index 6597b69..0000000
--- a/users/test/functional/webfinger_controller_test.rb
+++ /dev/null
@@ -1,33 +0,0 @@
-require 'test_helper'
-
-class WebfingerControllerTest < ActionController::TestCase
-
-  test "get host meta xml" do
-    get :host_meta, :format => :xml
-    assert_response :success
-    assert_equal "application/xml", response.content_type
-  end
-
-  test "get host meta json" do
-    get :host_meta, :format => :json
-    assert_response :success
-    assert_equal "application/json", response.content_type
-  end
-
-  test "get user webfinger xml" do
-    @user = stub_record :user, :public_key => 'my public key'
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :search, :q => @user.email_address.to_s, :format => :xml
-    assert_response :success
-    assert_equal "application/xml", response.content_type
-  end
-
-  test "get user webfinger json" do
-    @user = stub_record :user, :public_key => 'my public key'
-    User.stubs(:find_by_login).with(@user.login).returns(@user)
-    get :search, :q => @user.email_address.to_s, :format => :json
-    assert_response :success
-    assert_equal "application/json", response.content_type
-  end
-
-end