From fac0e44a7e3410e3a6bf312d295a0a652a778cec Mon Sep 17 00:00:00 2001
From: Michal Siedlaczek <michal.siedlaczek@nyu.edu>
Date: Sat, 12 Aug 2017 16:09:52 -0700
Subject: [PATCH] Test all available languages and getting installed langs when
 the dir doesn't exist

---
 qutebrowser/browser/webengine/spell.py     |  2 ++
 tests/unit/browser/webengine/test_spell.py | 21 ++++++++++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/qutebrowser/browser/webengine/spell.py b/qutebrowser/browser/webengine/spell.py
index 49ebbad2d..b61ca033c 100644
--- a/qutebrowser/browser/webengine/spell.py
+++ b/qutebrowser/browser/webengine/spell.py
@@ -95,6 +95,8 @@ def get_available_languages():
 
 def get_installed_languages():
     """Return a list of Language objects of all installed languages."""
+    if not os.path.isdir(get_dictionary_dir()):
+        return []
     installed_files = [os.path.basename(file)
                        for file in os.listdir(get_dictionary_dir())]
     all_languages = get_available_languages()
diff --git a/tests/unit/browser/webengine/test_spell.py b/tests/unit/browser/webengine/test_spell.py
index da8a0a3d6..65e5acba9 100644
--- a/tests/unit/browser/webengine/test_spell.py
+++ b/tests/unit/browser/webengine/test_spell.py
@@ -19,7 +19,7 @@
 
 
 from os.path import basename
-#from requests import head
+from requests import head
 
 import pytest
 
@@ -38,6 +38,13 @@ POLISH = spell.Language('pl-PL',
 LANGUAGE_LIST = [AFRIKAANS, ENGLISH, POLISH]
 
 
+def test_get_installed_languages(mocker):
+    # return an empty list if the dir doesn't exist
+    mocker.patch('qutebrowser.browser.webengine.spell.get_dictionary_dir',
+                 lambda: '/some-non-existing-dir')
+    assert spell.get_installed_languages() == []
+
+
 def test_get_available_languages():
     language_list = spell.get_available_languages()
     assert len(language_list) == 42
@@ -64,13 +71,13 @@ def test_install(tmpdir, mocker):
     mocker.patch('qutebrowser.browser.webengine.spell.get_dictionary_dir',
                  lambda: str(tmpdir))
     spell.install(LANGUAGE_LIST)
-    installed_files = [basename(file) for file in tmpdir.listdir()]
+    installed_files = [basename(str(file)) for file in tmpdir.listdir()]
     expected_files = [lang.file for lang in LANGUAGE_LIST]
     assert sorted(installed_files) == sorted(expected_files)
 
 
-#def test_available_langs():
-#    for lang in spell.get_available_languages():
-#        lang_url = '{}/{}'.format(spell.repository_url, lang.file)
-#        code, text, headers = head(lang_url)
-#        assert code == 200
+def test_available_langs():
+    for lang in spell.get_available_languages():
+        lang_url = '{}/{}'.format(spell.repository_url, lang.file)
+        response = head(lang_url)
+        assert response.status_code == 302