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, 39 deletions

diff --git a/users/test/functional/helper_methods_test.rb b/users/test/functional/helper_methods_test.rb
deleted file mode 100644
index 44226ae..0000000
--- a/users/test/functional/helper_methods_test.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Testing and documenting the helper methods available from
-# ApplicationController
-#
-
-require 'test_helper'
-
-class HelperMethodsTest < ActionController::TestCase
-  tests ApplicationController
-
-  # we test them right in here...
-  include ApplicationController._helpers
-
-  # the helpers all reference the controller.
-  def controller
-    @controller
-  end
-
-  def test_current_user
-    login
-    assert_equal @current_user, current_user
-  end
-
-  def test_logged_in
-    login
-    assert logged_in?
-  end
-
-  def test_logged_out
-    assert !logged_in?
-  end
-
-  def test_admin
-    login
-    @current_user.expects(:is_admin?).returns(bool = stub)
-    assert_equal bool, admin?
-  end
-
-end