Refactor http into frontend and api component

tests/test_component_api.py

@@ -5,13 +5,13 @@ tests.test_component_http
 Tests Home Assistant HTTP component does what it should do.
 """
 # pylint: disable=protected-access,too-many-public-methods
-import re
 import unittest
 import json
 
 import requests
 
 import homeassistant as ha
+import homeassistant.bootstrap as bootstrap
 import homeassistant.remote as remote
 import homeassistant.components.http as http
 
@@ -43,9 +43,12 @@ def setUpModule():   # pylint: disable=invalid-name
     hass.bus.listen('test_event', lambda _: _)
     hass.states.set('test.test', 'a_state')
 
-    http.setup(hass,
-               {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
-                              http.CONF_SERVER_PORT: SERVER_PORT}})
+    bootstrap.setup_component(
+        hass, http.DOMAIN,
+        {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
+         http.CONF_SERVER_PORT: SERVER_PORT}})
+
+    bootstrap.setup_component(hass, 'api')
 
     hass.start()
 
@@ -55,50 +58,17 @@ def tearDownModule():   # pylint: disable=invalid-name
     hass.stop()
 
 
-class TestHTTP(unittest.TestCase):
-    """ Test the HTTP debug interface and API. """
+class TestAPI(unittest.TestCase):
+    """ Test the API. """
 
-    def test_frontend_and_static(self):
-        """ Tests if we can get the frontend. """
-        req = requests.get(_url(""))
-
-        self.assertEqual(200, req.status_code)
-
-        # Test we can retrieve frontend.js
-        frontendjs = re.search(
-            r'(?P<app>\/static\/frontend-[A-Za-z0-9]{32}.html)',
-            req.text)
-
-        self.assertIsNotNone(frontendjs)
-
-        req = requests.head(_url(frontendjs.groups(0)[0]))
-
-        self.assertEqual(200, req.status_code)
-
-        # Test auto filling in api password
-        req = requests.get(
-            _url("?{}={}".format(http.DATA_API_PASSWORD, API_PASSWORD)))
-
-        self.assertEqual(200, req.status_code)
-
-        auth_text = re.search(r"auth='{}'".format(API_PASSWORD), req.text)
-
-        self.assertIsNotNone(auth_text)
-
-        # Test 404
-        self.assertEqual(404, requests.get(_url("/not-existing")).status_code)
-
-        # Test we cannot POST to /
-        self.assertEqual(405, requests.post(_url("")).status_code)
-
-    def test_api_password(self):
-        """ Test if we get access denied if we omit or provide
-            a wrong api password. """
+    # TODO move back to http component and test with use_auth.
+    def test_access_denied_without_password(self):
         req = requests.get(
             _url(remote.URL_API_STATES_ENTITY.format("test")))
 
         self.assertEqual(401, req.status_code)
 
+    def test_access_denied_with_wrong_password(self):
         req = requests.get(
             _url(remote.URL_API_STATES_ENTITY.format("test")),
             headers={remote.AUTH_HEADER: 'wrongpassword'})

tests/test_component_frontend.py

@@ -0,0 +1,96 @@
+"""
+tests.test_component_http
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Tests Home Assistant HTTP component does what it should do.
+"""
+# pylint: disable=protected-access,too-many-public-methods
+import re
+import unittest
+
+import requests
+
+import homeassistant as ha
+import homeassistant.bootstrap as bootstrap
+import homeassistant.remote as remote
+import homeassistant.components.http as http
+import homeassistant.components.frontend as frontend
+
+API_PASSWORD = "test1234"
+
+# Somehow the socket that holds the default port does not get released
+# when we close down HA in a different test case. Until I have figured
+# out what is going on, let's run this test on a different port.
+SERVER_PORT = 8121
+
+HTTP_BASE_URL = "http://127.0.0.1:{}".format(SERVER_PORT)
+
+HA_HEADERS = {remote.AUTH_HEADER: API_PASSWORD}
+
+hass = None
+
+
+def _url(path=""):
+    """ Helper method to generate urls. """
+    return HTTP_BASE_URL + path
+
+
+def setUpModule():   # pylint: disable=invalid-name
+    """ Initalizes a Home Assistant server. """
+    global hass
+
+    hass = ha.HomeAssistant()
+
+    hass.bus.listen('test_event', lambda _: _)
+    hass.states.set('test.test', 'a_state')
+
+    bootstrap.setup_component(
+        hass, http.DOMAIN,
+        {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
+                       http.CONF_SERVER_PORT: SERVER_PORT}})
+
+    bootstrap.setup_component(hass, 'frontend')
+
+    hass.start()
+
+
+def tearDownModule():   # pylint: disable=invalid-name
+    """ Stops the Home Assistant server. """
+    hass.stop()
+
+
+class TestFrontend(unittest.TestCase):
+    """ Test the frontend. """
+
+    def test_frontend_and_static(self):
+        """ Tests if we can get the frontend. """
+        req = requests.get(_url(""))
+
+        self.assertEqual(200, req.status_code)
+
+        # Test we can retrieve frontend.js
+        frontendjs = re.search(
+            r'(?P<app>\/static\/frontend-[A-Za-z0-9]{32}.html)',
+            req.text)
+
+        self.assertIsNotNone(frontendjs)
+
+        req = requests.head(_url(frontendjs.groups(0)[0]))
+
+        self.assertEqual(200, req.status_code)
+
+    def test_auto_filling_in_api_password(self):
+        req = requests.get(
+            _url("?{}={}".format(http.DATA_API_PASSWORD, API_PASSWORD)))
+
+        self.assertEqual(200, req.status_code)
+
+        auth_text = re.search(r"auth='{}'".format(API_PASSWORD), req.text)
+
+        self.assertIsNotNone(auth_text)
+
+    def test_404(self):
+        self.assertEqual(404, requests.get(_url("/not-existing")).status_code)
+
+    def test_we_cannot_POST_to_root(self):
+        self.assertEqual(405, requests.post(_url("")).status_code)

tests/test_remote.py

@@ -10,6 +10,7 @@ Uses port 8125 as a port that nothing runs on
 import unittest
 
 import homeassistant as ha
+import homeassistant.bootstrap as bootstrap
 import homeassistant.remote as remote
 import homeassistant.components.http as http
 
@@ -36,9 +37,12 @@ def setUpModule():   # pylint: disable=invalid-name
     hass.bus.listen('test_event', lambda _: _)
     hass.states.set('test.test', 'a_state')
 
-    http.setup(hass,
-               {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
-                              http.CONF_SERVER_PORT: 8122}})
+    bootstrap.setup_component(
+        hass, http.DOMAIN,
+        {http.DOMAIN: {http.CONF_API_PASSWORD: API_PASSWORD,
+         http.CONF_SERVER_PORT: 8122}})
+
+    bootstrap.setup_component(hass, 'api')
 
     hass.start()