Implemented basic tests for Bootstrap and Bulma

Author: 4d11

.gitignore

@@ -1,6 +1,7 @@
 venv/
 .idea/
 __pycache__/
+.pytest_cache/
 *.pyc
 
 # Setuptools distribution folder.

csskrt/bootstrapCsskrt.py

@@ -3,14 +3,14 @@
 
 
 class BootstrapCsskrt(Csskrt):
-    def __init__(self, fileName, pretty_print):
+    def __init__(self, fileName):
         tag_styles = {
             'input': 'form-control',
             'select': 'custom-select',
             'button': 'btn btn-primary',
             'checkbox': 'form-check-input',
         }
-        super().__init__(fileName, pretty_print, tag_styles)
+        super().__init__(fileName, tag_styles)
 
     def version(self):
         return "v4.1"

csskrt/bulmaCsskrt.py

@@ -3,7 +3,7 @@
 
 
 class BulmaCsskrt(Csskrt):
-    def __init__(self, fileName, pretty_print):
+    def __init__(self, fileName):
         tag_styles = {
             'input': 'input',
             'label': 'label',
@@ -19,7 +19,7 @@ def __init__(self, fileName, pretty_print):
             'h5': 'title is-5',
             'h6': 'title is-6'
         }
-        super().__init__(fileName, pretty_print, tag_styles)
+        super().__init__(fileName, tag_styles)
 
     def version(self):
         return "v0.7.1"

csskrt/csskrt.py

@@ -5,11 +5,10 @@
 
 
 class Csskrt(ABC):
-    def __init__(self, filename: str, pretty_print, tag_styles: Dict):
+    def __init__(self, filename: str, tag_styles: Dict):
         f = open(filename)  # should be able to handle dirs (for later) todo
         f_data = f.read()
 
-        self.pretty_print = pretty_print
         self.file_path = filename
         self.soup = BeautifulSoup(f_data, 'html.parser')
         self.tag_styles = tag_styles
@@ -149,7 +148,6 @@ def add_list_classes(self, list_tags: dict) -> NoReturn:
                     # recursive=False to prevent double modifying for nested lists
                     self.add_class_to_element(li, list_tags['li'])
 
-
     def add_general_classes(self):
         """
         Adds styles to single elements
@@ -163,7 +161,7 @@ def add_general_classes(self):
                 for elem in self.soup.find_all(tag):
                     self.add_class_to_element(elem, self.tag_styles[tag])
 
-    def output(self) -> NoReturn:
+    def output(self, pretty_print: bool) -> NoReturn:
         """
         Outputs a new file.
         :return:
@@ -174,7 +172,7 @@ def output(self) -> NoReturn:
 
         new_file_name = os.path.join(folder, 'output/csskrt_' + file_name + ext)
         with open(new_file_name, 'w') as out_file:
-            if self.pretty_print:
+            if pretty_print:
                 out_file.write(str(self.soup))
             else:
                 out_file.write(self.soup.prettify())
@@ -206,7 +204,4 @@ def freshify(self) -> NoReturn:
         # Add styles for the rest of the elements
         self.add_general_classes()
 
-        # Output the modified html file
-        self.output()
-
-        return self.soup
+        return self.soup

csskrt/main.py

@@ -14,12 +14,12 @@ def freshify(filename, framework, pretty_print):
     csskrter = None
 
     if framework == 'bootstrap':
-        csskrter = BootstrapCsskrt(filename, pretty_print)
+        csskrter = BootstrapCsskrt(filename)
     elif framework == 'bulma':
-        csskrter = BulmaCsskrt(filename, pretty_print)
-
+        csskrter = BulmaCsskrt(filename)
 
     csskrter.freshify()
+    csskrter.output(pretty_print)
     print()
     print("~~~ Done! ~~~~")
 

test/test1.html test/input/test1.htmltest/test1.html renamed to test/input/test1.html

@@ -16,17 +16,12 @@ <h2> Forms ! </h2>
         <label for="someText"> Here is an input field </label>
         <input id="someText" type="text">
 
-        <div>
-            <label> Option 1
-                <input type="radio" name="my-radio">
-            </label>
-            <label> Option 2
-                <input type="radio" name="my-radio">
-            </label>
-            <label> Option 3
-                <input type="radio" name="my-radio">
-            </label>
-        </div>
+        <label for="opt1"> Option 1 </label>
+        <input type="radio" id="opt1" name="my-radio">
+        <label for="opt2"> Option 2 </label>
+        <input type="radio" id="opt2" name="my-radio">
+        <label for="opt3"> Option 3 </label>
+        <input type="radio" id="opt3" name="my-radio">
 
         <button class="my-button-test" type="submit" onclick="alert('submitted')"> Click me</button>
     </form>

test/test_bootstrap.py

@@ -0,0 +1,87 @@
+import sys, os
+import copy
+import unittest
+import pytest
+from bs4 import BeautifulSoup
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from csskrt.bootstrapCsskrt import BootstrapCsskrt
+
+
+@pytest.fixture()
+def bootstrap_csskrt():
+    bs_csskrt = BootstrapCsskrt(os.path.join(os.path.dirname(__file__), 'input/test1.html'))
+    before = copy.copy(bs_csskrt.soup)
+    bs_csskrt.freshify()
+    after = bs_csskrt.soup
+    return before, after
+
+# Fix checkbox case
+
+class TestBootstrapButtons():
+    def test_compare_num_button_tags(self, bootstrap_csskrt):
+        before: BeautifulSoup = bootstrap_csskrt[0]
+        after: BeautifulSoup = bootstrap_csskrt[1]
+        tag = 'button'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        assert (len(old_tags) == len(new_tags))
+
+    def test_buttons_styles(self, bootstrap_csskrt):
+        before: BeautifulSoup = bootstrap_csskrt[0]
+        after: BeautifulSoup = bootstrap_csskrt[1]
+        tag = 'button'
+        style = ['btn', 'btn-primary']
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for old_t, new_t in zip(old_tags, new_tags):
+            old_class = old_t.get('class', [])
+            new_class = new_t.get('class', [])
+
+            if type(new_class) == str:  # sometimes get returns str instead of list
+                new_class = new_class.strip().split(' ')
+
+            assert(set(old_class).issubset(new_class))
+
+    def test_buttons_content(self, bootstrap_csskrt):
+        before: BeautifulSoup = bootstrap_csskrt[0]
+        after: BeautifulSoup = bootstrap_csskrt[1]
+        tag = 'button'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for old_t, new_t in zip(old_tags, new_tags):
+            assert old_t.get_text() == new_t.get_text()
+
+
+class TestBootstrapForm():
+    def test_number_form_tags(self, bootstrap_csskrt):
+        before: BeautifulSoup = bootstrap_csskrt[0]
+        after: BeautifulSoup = bootstrap_csskrt[1]
+        tag = 'form'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        assert (len(old_tags) == len(new_tags))
+
+    def test_form_wrapper(self, bootstrap_csskrt):
+        before: BeautifulSoup = bootstrap_csskrt[0]
+        after: BeautifulSoup = bootstrap_csskrt[1]
+        tag = 'form'
+        wrapper_class = 'form-group'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for form in new_tags:
+            wrappers = form.find_all('div', recursive=False, attrs={'class': wrapper_class})
+            inputs = form.find_all('input')
+            assert len(wrappers) == len(inputs)  # 1 input per wrapper ?
+
+            for wrapper in wrappers:
+                inputs = wrapper.find_all('input')
+                assert len(inputs) == 1
+
+
+

test/test_bulma.py

@@ -0,0 +1,85 @@
+import sys, os
+import copy
+import pytest
+from bs4 import BeautifulSoup
+
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
+from csskrt.bulmaCsskrt import BulmaCsskrt
+
+
+@pytest.fixture()
+def bulma_csskrt():
+    bulma_csskrt = BulmaCsskrt(os.path.join(os.path.dirname(__file__), 'input/test1.html'))
+    before = copy.copy(bulma_csskrt.soup)
+    bulma_csskrt.freshify()
+    after = bulma_csskrt.soup
+    return before, after
+
+
+class TestBulmaButtons():
+    def test_compare_num_button_tags(self, bulma_csskrt):
+        before: BeautifulSoup = bulma_csskrt[0]
+        after: BeautifulSoup = bulma_csskrt[1]
+        tag = 'button'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        assert (len(old_tags) == len(new_tags))
+
+    def test_buttons_styles(self, bulma_csskrt):
+        before: BeautifulSoup = bulma_csskrt[0]
+        after: BeautifulSoup = bulma_csskrt[1]
+        tag = 'button'
+        style = ['button']
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for old_t, new_t in zip(old_tags, new_tags):
+            old_class = old_t.get('class', [])
+            new_class = new_t.get('class', [])
+
+            if type(new_class) == str:  # sometimes get returns str instead of list
+                new_class = new_class.strip().split(' ')
+
+            assert(set(old_class).issubset(new_class))
+
+    def test_buttons_content(self, bulma_csskrt):
+        before: BeautifulSoup = bulma_csskrt[0]
+        after: BeautifulSoup = bulma_csskrt[1]
+        tag = 'button'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for old_t, new_t in zip(old_tags, new_tags):
+            assert old_t.get_text() == new_t.get_text()
+
+
+class TestBootstrapForm():
+    def test_number_form_tags(self, bulma_csskrt):
+        before: BeautifulSoup = bulma_csskrt[0]
+        after: BeautifulSoup = bulma_csskrt[1]
+        tag = 'form'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        assert (len(old_tags) == len(new_tags))
+
+    def test_form_wrapper(self, bulma_csskrt):
+        before: BeautifulSoup = bulma_csskrt[0]
+        after: BeautifulSoup = bulma_csskrt[1]
+        tag = 'form'
+        wrapper_class = 'field'
+
+        old_tags = before.find_all(tag)
+        new_tags = after.find_all(tag)
+        for form in new_tags:
+            wrappers = form.find_all('div', recursive=False, attrs={'class': wrapper_class})
+            inputs = form.find_all('input')
+            assert len(wrappers) == len(inputs)  # 1 input per wrapper ?
+
+            for wrapper in wrappers:
+                inputs = wrapper.find_all('input')
+                assert len(inputs) == 1
+
+
+