Move symbol static to /symbols

tests/controller/test_symbols.py

@@ -26,8 +26,12 @@ def test_list():
     symbols = Symbols()
     assert {
         'symbol_id': ':/symbols/firewall.svg',
-        'url': '/static/builtin_symbols/firewall.svg',
         'filename': 'firewall.svg',
         'builtin': True
     } in symbols.list()
     assert symbols
+
+
+def test_get_path():
+    symbols = Symbols()
+    assert symbols.get_path(':/symbols/firewall.svg') == get_resource("symbols/firewall.svg")

tests/handlers/api/controller/test_symbol.py

@@ -15,6 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import urllib.parse
+
 from gns3server.config import Config
 
 
@@ -23,7 +25,17 @@ def test_symbols(http_controller):
     assert response.status == 200
     assert {
         'symbol_id': ':/symbols/firewall.svg',
-        'url': '/static/builtin_symbols/firewall.svg',
         'filename': 'firewall.svg',
         'builtin': True
     } in response.json
+
+
+def test_get(http_controller):
+    response = http_controller.get('/symbols/' + urllib.parse.quote(':/symbols/firewall.svg') + '/raw')
+    assert response.status == 200
+    assert response.headers['CONTENT-LENGTH'] == '9381'
+    assert response.headers['CONTENT-TYPE'] == 'image/svg+xml'
+    assert '</svg>' in response.html
+
+    response = http_controller.get('/symbols/404.png/raw')
+    assert response.status == 404

tests/handlers/test_static.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2015 GNS3 Technologies Inc.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-import aiohttp
-import os
-from unittest.mock import patch
-
-
-def test_get(http_root):
-    response = http_root.get('/static/builtin_symbols/firewall.svg')
-    assert response.status == 200
-    assert response.headers['CONTENT-LENGTH'] == '9381'
-    assert response.headers['CONTENT-TYPE'] == 'image/svg+xml'
-    assert '</svg>' in response.html
-
-    response = http_root.get('/static/builtin_symbols/../main.py')
-    assert response.status == 404
-
-    response = http_root.get('/static/builtin_symbols/404.png')
-    assert response.status == 404