Merge pull request #106 from tubone24/fix_test

Fix test
tubone24 · Jul 13, 2019 · e764f63 · e764f63
2 parents 6ccf235 + 5bde880
commit e764f63
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 47 deletions.
diff --git a/doc_src/ebook_homebrew.models.rst b/doc_src/ebook_homebrew.models.rst
@@ -8,15 +8,15 @@ ebook\_homebrew.models.models module
 ------------------------------------
 
 .. automodule:: ebook_homebrew.models.models
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 
 Module contents
 ---------------
 
 .. automodule:: ebook_homebrew.models
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc_src/ebook_homebrew.rst b/doc_src/ebook_homebrew.rst
@@ -6,8 +6,8 @@ Subpackages
 
 .. toctree::
 
-    ebook_homebrew.models
-    ebook_homebrew.utils
+   ebook_homebrew.models
+   ebook_homebrew.utils
 
 Submodules
 ----------
@@ -16,71 +16,71 @@ ebook\_homebrew.archive module
 ------------------------------
 
 .. automodule:: ebook_homebrew.archive
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.cli module
 --------------------------
 
 .. automodule:: ebook_homebrew.cli
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.convert module
 ------------------------------
 
 .. automodule:: ebook_homebrew.convert
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.core module
 ---------------------------
 
 .. automodule:: ebook_homebrew.core
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.exceptions module
 ---------------------------------
 
 .. automodule:: ebook_homebrew.exceptions
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.helper module
 -----------------------------
 
 .. automodule:: ebook_homebrew.helper
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.rename module
 -----------------------------
 
 .. automodule:: ebook_homebrew.rename
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 ebook\_homebrew.rest module
 ---------------------------
 
 .. automodule:: ebook_homebrew.rest
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 
 Module contents
 ---------------
 
 .. automodule:: ebook_homebrew
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc_src/ebook_homebrew.utils.rst b/doc_src/ebook_homebrew.utils.rst
@@ -8,15 +8,15 @@ ebook\_homebrew.utils.logging module
 ------------------------------------
 
 .. automodule:: ebook_homebrew.utils.logging
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
 
 
 Module contents
 ---------------
 
 .. automodule:: ebook_homebrew.utils
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/doc_src/setup.rst b/doc_src/setup.rst
@@ -2,6 +2,6 @@ setup module
 ============
 
 .. automodule:: setup
-    :members:
-    :undoc-members:
-    :show-inheritance:
+   :members:
+   :undoc-members:
+   :show-inheritance:
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -22,9 +22,17 @@ RUN yum install -y \
  && ln -sf /usr/bin/pip3.6 /usr/bin/pip3 \
  && pip3 install --upgrade pip
 
+# setup ebook-homebrew
 RUN mkdir /app
-RUN cd /app && git clone https://github.com/tubone24/ebook_homebrew.git
+RUN cd /app && git clone https://github.com/tubone24/ebook_homebrew.git && git submodule foreach git pull origin master
 WORKDIR /app/ebook_homebrew
 RUN pip3 install -r requirements.txt
 RUN python3 setup.py install
+
+# setup vue client
+RUN rm ebook_homebrew/static/index.html
+RUN cd examples/ebook-homebrew-vue-client && npm run build
+RUN cp -r examples/ebook-homebrew-vue-client/dist/* ebook_homebrew/static
+RUN python3 setup.py install
+
 CMD ebookhomebrew api -p ${PORT}
diff --git a/tests/assets/schema.yml → tests/ut/assets/schema.yml b/tests/assets/schema.yml → tests/ut/assets/schema.yml
diff --git a/tests/ut/assets/test_image.png b/tests/ut/assets/test_image.png
diff --git a/tests/test_archive.py → tests/ut/test_archive.py b/tests/test_archive.py → tests/ut/test_archive.py
diff --git a/tests/test_cli.py → tests/ut/test_cli.py b/tests/test_cli.py → tests/ut/test_cli.py
diff --git a/tests/test_convert.py → tests/ut/test_convert.py b/tests/test_convert.py → tests/ut/test_convert.py
diff --git a/tests/test_core.py → tests/ut/test_core.py b/tests/test_core.py → tests/ut/test_core.py
diff --git a/tests/test_helper.py → tests/ut/test_helper.py b/tests/test_helper.py → tests/ut/test_helper.py
diff --git a/tests/test_rename.py → tests/ut/test_rename.py b/tests/test_rename.py → tests/ut/test_rename.py
diff --git a/tests/test_rest.py → tests/ut/test_rest.py b/tests/test_rest.py → tests/ut/test_rest.py
@@ -17,12 +17,12 @@ def api():
 
 @pytest.fixture
 def image_b64():
-    with open(os.path.join(os.path.dirname(__file__), "it", "assets", "test_image.png"), "rb") as f:
+    with open(os.path.join(os.path.dirname(__file__), "assets", "test_image.png"), "rb") as f:
         return base64.b64encode(f.read()).decode("utf-8")
 
 
 def copy_image_file(directory):
-    test_file = os.path.join(os.path.dirname(__file__), "it", "assets", "test_image.png")
+    test_file = os.path.join(os.path.dirname(__file__), "assets", "test_image.png")
     for i in range(100):
         shutil.copy2(test_file, directory)
         dst_file_name = os.path.join(directory, "foo" + str(i).zfill(3) + "bar.png")