Phase 13: Add comprehensive tests for CLI and API, fix conftest.py

Author: Abdur-rahmaanJ

pythoncms/__main__.py

@@ -0,0 +1,4 @@
+from .cli import cli
+
+if __name__ == "__main__":
+    cli()

pythoncms/cli.py

@@ -30,7 +30,7 @@
 
 
 @click.group()
-@click.version_option(__version__)
+@click.version_option(__version__, prog_name="pythoncms")
 def cli():
     """pythoncms CLI - The fastest way to build CMS in Python"""
     pass

pythoncms/conftest.py

@@ -12,8 +12,8 @@
 from flask import url_for
 from flask_login import current_user as _current_user
 from init import db as _db
-from modules.box__default.auth.models import User
-from modules.box__default.keyvalue.models import Settings
+from shopyo_auth.models import User
+from shopyo_settings.models import Settings
 from sqlalchemy import event
 
 # run in shopyo/shopyo
@@ -111,8 +111,12 @@ def db(test_client, non_admin_user, admin_user, unconfirmed_user):
     with open("config.json") as config:
         config = json.load(config)
     for name, value in config["settings"].items():
-        s = Settings(setting=name, value=value)
-        _db.session.add(s)
+        existing = Settings.query.filter_by(setting=name).first()
+        if not existing:
+            s = Settings(setting=name, value=value)
+            _db.session.add(s)
+        else:
+            existing.value = value
 
     # Commit the changes for the users
     _db.session.commit()

pythoncms/modules/api/tests/test_api_functional.py

@@ -0,0 +1,82 @@
+import pytest
+from init import db
+from modules.contenttype.models import ContentType, ContentItem
+import os
+
+# We use fixtures from conftest.py: test_client, db, db_session
+
+def test_get_types_empty(test_client):
+    response = test_client.get("/api/v1/types")
+    assert response.status_code == 200
+    # Might not be empty if other tests or initialization added types
+    # but in a clean testing.db it should be [] if we didn't add any in db fixture
+    assert isinstance(response.json, list)
+
+def test_get_content_not_found(test_client):
+    response = test_client.get("/api/v1/nonexistent")
+    assert response.status_code == 404
+    assert "error" in response.json
+
+def test_api_auth(test_client, monkeypatch):
+    # Set API_TOKEN for testing auth
+    monkeypatch.setenv("API_TOKEN", "test-token")
+    
+    # Unauthorized request (get_content checks auth)
+    response = test_client.get("/api/v1/blog")
+    assert response.status_code == 401
+    
+    # Authorized request
+    headers = {"Authorization": "Bearer test-token"}
+    response = test_client.get("/api/v1/blog", headers=headers)
+    assert response.status_code == 404 # Content type not found, but not 401
+
+def test_get_content_with_data(test_client):
+    # Create content type and items
+    ct = ContentType(name="blog", schema=[{"name": "title", "type": "text"}])
+    db.session.add(ct)
+    db.session.commit()
+    
+    item1 = ContentItem(content_type_id=ct.id, data={"title": "First"})
+    item2 = ContentItem(content_type_id=ct.id, data={"title": "Second"})
+    db.session.add_all([item1, item2])
+    db.session.commit()
+    
+    response = test_client.get("/api/v1/blog")
+    assert response.status_code == 200
+    assert response.json["meta"]["total"] == 2
+    assert len(response.json["data"]) == 2
+    # Default order is desc by created_at, item2 was added last
+    assert response.json["data"][0]["content"]["title"] == "Second"
+
+def test_api_pagination(test_client):
+    ct = ContentType(name="posts", schema=[{"name": "title", "type": "text"}])
+    db.session.add(ct)
+    db.session.commit()
+    
+    for i in range(5):
+        db.session.add(ContentItem(content_type_id=ct.id, data={"title": str(i)}))
+    db.session.commit()
+    
+    response = test_client.get("/api/v1/posts?limit=2&offset=0")
+    assert response.status_code == 200
+    assert response.json["meta"]["limit"] == 2
+    assert len(response.json["data"]) == 2
+    
+    response = test_client.get("/api/v1/posts?limit=2&offset=4")
+    assert len(response.json["data"]) == 1
+
+def test_api_sorting(test_client):
+    ct = ContentType(name="news", schema=[{"name": "title", "type": "text"}])
+    db.session.add(ct)
+    db.session.commit()
+    
+    item1 = ContentItem(content_type_id=ct.id, data={"title": "A"})
+    item2 = ContentItem(content_type_id=ct.id, data={"title": "B"})
+    db.session.add_all([item1, item2])
+    db.session.commit()
+    
+    response = test_client.get("/api/v1/news?sort_by=id&order=asc")
+    assert response.json["data"][0]["content"]["title"] == "A"
+    
+    response = test_client.get("/api/v1/news?sort_by=id&order=desc")
+    assert response.json["data"][0]["content"]["title"] == "B"

pythoncms/tests/test_cli.py

@@ -0,0 +1,30 @@
+import os
+import shutil
+from click.testing import CliRunner
+from pythoncms.cli import cli
+
+def test_cli_start(tmp_path):
+    runner = CliRunner()
+    with runner.isolated_filesystem(temp_dir=tmp_path):
+        result = runner.invoke(cli, ["start", "mysite"])
+        assert result.exit_code == 0
+        assert "mysite is ready" in result.output
+        assert os.path.exists("mysite")
+        assert os.path.exists("mysite/.env")
+        assert os.path.exists("mysite/requirements.txt")
+
+def test_cli_deploy(tmp_path):
+    runner = CliRunner()
+    with runner.isolated_filesystem(temp_dir=tmp_path):
+        result = runner.invoke(cli, ["deploy"])
+        assert result.exit_code == 0
+        assert "Deployment files generated" in result.output
+        assert os.path.exists("Dockerfile")
+        assert os.path.exists("docker-compose.yml")
+        assert os.path.exists(".dockerignore")
+
+def test_cli_version():
+    runner = CliRunner()
+    result = runner.invoke(cli, ["--version"])
+    assert result.exit_code == 0
+    assert "pythoncms, version" in result.output

pythoncms/tests/test_dunder_main.py

@@ -11,11 +11,11 @@
 #      __main__.main()
 #      captured = capfd.readouterr()
 #      assert "Please use Shopyo in a virtual environment for this command" in captured.out
-import subprocess
-import sys
+from click.testing import CliRunner
+from pythoncms.cli import cli
 
-
-def test_no_args(capfd):
-    subprocess.run([sys.executable, "__main__.py"], text=True)
-    captured = capfd.readouterr()
-    assert "No arguments supplied" in captured.out
+def test_no_args():
+    runner = CliRunner()
+    result = runner.invoke(cli)
+    assert result.exit_code == 0
+    assert "The fastest way to build CMS in Python" in result.output