From 215839c4234ab65807020b42eb67a76cfa6e8767 Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Sun, 19 Jan 2020 15:03:38 +0000 Subject: [PATCH] Add end-to-end test framework --- app/blueprints/homepage/__init__.py | 3 +- app/default_data.py | 330 ++++++++++++++++++++++++++ app/models.py | 12 +- app/templates/flask_user/login.html | 6 +- app/tests/test_homepage.py | 11 + app/tests/utils.py | 29 +++ requirements.txt | 2 + utils/setup.py | 351 +--------------------------- utils/tests.sh | 3 + 9 files changed, 391 insertions(+), 356 deletions(-) create mode 100644 app/default_data.py create mode 100644 app/tests/test_homepage.py create mode 100644 app/tests/utils.py create mode 100755 utils/tests.sh diff --git a/app/blueprints/homepage/__init__.py b/app/blueprints/homepage/__init__.py index 76dbb92..df638df 100644 --- a/app/blueprints/homepage/__init__.py +++ b/app/blueprints/homepage/__init__.py @@ -15,6 +15,7 @@ def home(): pop_mod = query.filter_by(type=PackageType.MOD).order_by(db.desc(Package.score)).limit(8).all() pop_gam = query.filter_by(type=PackageType.GAME).order_by(db.desc(Package.score)).limit(4).all() pop_txp = query.filter_by(type=PackageType.TXP).order_by(db.desc(Package.score)).limit(4).all() - downloads = db.session.query(func.sum(PackageRelease.downloads)).first()[0] + downloads_result = db.session.query(func.sum(PackageRelease.downloads)).one_or_none() + downloads = 0 if not downloads_result or not downloads_result[0] else downloads_result[0] return render_template("index.html", count=count, downloads=downloads, \ new=new, pop_mod=pop_mod, pop_txp=pop_txp, pop_gam=pop_gam) diff --git a/app/default_data.py b/app/default_data.py new file mode 100644 index 0000000..9898008 --- /dev/null +++ b/app/default_data.py @@ -0,0 +1,330 @@ +from .models import * +from .utils import make_flask_user_password + + +def populate(session): + ruben = User("rubenwardy") + ruben.active = True + ruben.password = make_flask_user_password("tuckfrump") + ruben.github_username = "rubenwardy" + ruben.forums_username = "rubenwardy" + ruben.rank = UserRank.ADMIN + session.add(ruben) + + tags = {} + for tag in ["Inventory", "Mapgen", "Building", \ + "Mobs and NPCs", "Tools", "Player effects", \ + "Environment", "Transport", "Maintenance", "Plants and farming", \ + "PvP", "PvE", "Survival", "Creative", "Puzzle", "Multiplayer", "Singleplayer"]: + row = Tag(tag) + tags[row.name] = row + session.add(row) + + licenses = {} + for license in ["GPLv2.1", "GPLv3", "LGPLv2.1", "LGPLv3", "AGPLv2.1", "AGPLv3", + "Apache", "BSD 3-Clause", "BSD 2-Clause", "CC0", "CC-BY-SA", + "CC-BY", "MIT", "ZLib", "Other (Free)"]: + row = License(license) + licenses[row.name] = row + session.add(row) + + for license in ["CC-BY-NC-SA", "Other (Non-free)"]: + row = License(license, False) + licenses[row.name] = row + session.add(row) + + +def populate_test_data(session, licenses, tags, admin_user): + ez = User("Shara") + ez.github_username = "Ezhh" + ez.forums_username = "Shara" + ez.rank = UserRank.EDITOR + session.add(ez) + + not1 = Notification(ruben, ez, "Awards approved", "/packages/rubenwardy/awards/") + session.add(not1) + + jeija = User("Jeija") + jeija.github_username = "Jeija" + jeija.forums_username = "Jeija" + session.add(jeija) + + + mod = Package() + mod.approved = True + mod.name = "alpha" + mod.title = "Alpha Test" + mod.license = licenses["MIT"] + mod.type = PackageType.MOD + mod.author = ruben + mod.tags.append(tags["mapgen"]) + mod.tags.append(tags["environment"]) + mod.repo = "https://github.com/ezhh/other_worlds" + mod.issueTracker = "https://github.com/ezhh/other_worlds/issues" + mod.forums = 16015 + mod.short_desc = "The content library should not be used yet as it is still in alpha" + mod.desc = "This is the long desc" + session.add(mod) + + rel = PackageRelease() + rel.package = mod + rel.title = "v1.0.0" + rel.url = "https://github.com/ezhh/handholds/archive/master.zip" + rel.approved = True + session.add(rel) + + mod1 = Package() + mod1.approved = True + mod1.name = "awards" + mod1.title = "Awards" + mod1.license = licenses["LGPLv2.1"] + mod1.type = PackageType.MOD + mod1.author = ruben + mod1.tags.append(tags["player_effects"]) + mod1.repo = "https://github.com/rubenwardy/awards" + mod1.issueTracker = "https://github.com/rubenwardy/awards/issues" + mod1.forums = 4870 + mod1.short_desc = "Adds achievements and an API to register new ones." + mod1.desc = """ +Majority of awards are back ported from Calinou's old fork in Carbone, under same license. + +``` +awards.register_achievement("award_mesefind",{ + title = "First Mese Find", + description = "Found some Mese!", + trigger = { + type = "dig", -- award is given when + node = "default:mese", -- this type of node has been dug + target = 1, -- this number of times + }, +}) +``` +""" + + rel = PackageRelease() + rel.package = mod1 + rel.title = "v1.0.0" + rel.url = "https://github.com/rubenwardy/awards/archive/master.zip" + rel.approved = True + session.add(rel) + + mod2 = Package() + mod2.approved = True + mod2.name = "mesecons" + mod2.title = "Mesecons" + mod2.tags.append(tags["tools"]) + mod2.type = PackageType.MOD + mod2.license = licenses["LGPLv3"] + mod2.author = jeija + mod2.repo = "https://github.com/minetest-mods/mesecons/" + mod2.issueTracker = "https://github.com/minetest-mods/mesecons/issues" + mod2.forums = 628 + mod2.short_desc = "Mesecons adds everything digital, from all kinds of sensors, switches, solar panels, detectors, pistons, lamps, sound blocks to advanced digital circuitry like logic gates and programmable blocks." + mod2.desc = """ +MESECONS by Jeija and contributors + +Mezzee-what? +------------ +[Mesecons](http://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay. + +Mesecons is a mod for [Minetest](http://minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks. + +Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics. + +OK, I want in. +-------------- +Go get it! + +[DOWNLOAD IT NOW](https://github.com/minetest-mods/mesecons/archive/master.zip) + +Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary: + +1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer. +2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one. +3. Open up the Minetest mods folder - usually `/mods/`. If you see the `minetest` or folder inside of that, that is your mod folder instead. +4. Copy the Mesecons folder into the mods folder. + +Don't like some parts of Mesecons? Open up the Mesecons folder and delete the subfolder containing the mod you don't want. If you didn't want movestones, for example, all you have to do is delete the `mesecons_movestones` folder and they will no longer be available. + +There are no dependencies - it will work right after installing! + +How do I use this thing? +------------------------ +How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)? + +Or maybe a [comprehensive reference](http://mesecons.net/items.html) is your style? + +An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look? + +Want to get more into building? Why not check out the [Mesecons Laboratory](http://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders? + +Want to contribute to Mesecons itself? Check out the [source code](https://github.com/minetest-mods/mesecons)! + +Who wrote it anyways? +--------------------- +These awesome people made Mesecons possible! + +| Contributor | Contribution | +| --------------- | -------------------------------- | +| Hawk777 | Code for VoxelManip caching | +| Jat15 | Various tweaks. | +| Jeija | **Main developer! Everything.** | +| Jordach | Noteblock sounds. | +| khonkhortistan | Code, recipes, textures. | +| Kotolegokot | Nodeboxes for items. | +| minerd247 | Textures. | +| Nore/Novatux | Code. | +| RealBadAngel | Fixes, improvements. | +| sfan5 | Code, recipes, textures. | +| suzenako | Piston sounds. | +| Uberi/Temperest | Code, textures, documentation. | +| VanessaE | Code, recipes, textures, design. | +| Whiskers75 | Logic gates implementation. | + +There are also a whole bunch of other people helping with everything from code to testing and feedback. Mesecons would also not be possible without their help! + +Alright, how can I use it? +-------------------------- +All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic). That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one. + +All code in this project is licensed under the LGPL version 3 or later. That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license. + +No warranty is provided, express or implied, for any part of the project. + +""" + + session.add(mod1) + session.add(mod2) + + mod = Package() + mod.approved = True + mod.name = "handholds" + mod.title = "Handholds" + mod.license = licenses["MIT"] + mod.type = PackageType.MOD + mod.author = ez + mod.tags.append(tags["player_effects"]) + mod.repo = "https://github.com/ezhh/handholds" + mod.issueTracker = "https://github.com/ezhh/handholds/issues" + mod.forums = 17069 + mod.short_desc = "Adds hand holds and climbing thingies" + mod.desc = "This is the long desc" + session.add(mod) + + rel = PackageRelease() + rel.package = mod + rel.title = "v1.0.0" + rel.url = "https://github.com/ezhh/handholds/archive/master.zip" + rel.approved = True + session.add(rel) + + mod = Package() + mod.approved = True + mod.name = "other_worlds" + mod.title = "Other Worlds" + mod.license = licenses["MIT"] + mod.type = PackageType.MOD + mod.author = ez + mod.tags.append(tags["mapgen"]) + mod.tags.append(tags["environment"]) + mod.repo = "https://github.com/ezhh/other_worlds" + mod.issueTracker = "https://github.com/ezhh/other_worlds/issues" + mod.forums = 16015 + mod.short_desc = "Adds space with asteroids and comets" + mod.desc = "This is the long desc" + session.add(mod) + + mod = Package() + mod.approved = True + mod.name = "food" + mod.title = "Food" + mod.license = licenses["LGPLv2.1"] + mod.type = PackageType.MOD + mod.author = ruben + mod.tags.append(tags["player_effects"]) + mod.repo = "https://github.com/rubenwardy/food/" + mod.issueTracker = "https://github.com/rubenwardy/food/issues/" + mod.forums = 2960 + mod.short_desc = "Adds lots of food and an API to manage ingredients" + mod.desc = "This is the long desc" + food = mod + session.add(mod) + + mod = Package() + mod.approved = True + mod.name = "food_sweet" + mod.title = "Sweet Foods" + mod.license = licenses["CC0"] + mod.type = PackageType.MOD + mod.author = ruben + mod.tags.append(tags["player_effects"]) + mod.repo = "https://github.com/rubenwardy/food_sweet/" + mod.issueTracker = "https://github.com/rubenwardy/food_sweet/issues/" + mod.forums = 9039 + mod.short_desc = "Adds sweet food" + mod.desc = "This is the long desc" + food_sweet = mod + session.add(mod) + + game1 = Package() + game1.approved = True + game1.name = "capturetheflag" + game1.title = "Capture The Flag" + game1.type = PackageType.GAME + game1.license = licenses["LGPLv2.1"] + game1.author = ruben + game1.tags.append(tags["pvp"]) + game1.tags.append(tags["survival"]) + game1.tags.append(tags["multiplayer"]) + game1.repo = "https://github.com/rubenwardy/capturetheflag" + game1.issueTracker = "https://github.com/rubenwardy/capturetheflag/issues" + game1.forums = 12835 + game1.short_desc = "Two teams battle to snatch and return the enemy's flag, before the enemy takes their own!" + game1.desc = """ +As seen on the Capture the Flag server (minetest.rubenwardy.com:30000) + +Uses the CTF PvP Engine. +""" + + session.add(game1) + + rel = PackageRelease() + rel.package = game1 + rel.title = "v1.0.0" + rel.url = "https://github.com/rubenwardy/capturetheflag/archive/master.zip" + rel.approved = True + session.add(rel) + + + mod = Package() + mod.approved = True + mod.name = "pixelbox" + mod.title = "PixelBOX Reloaded" + mod.license = licenses["CC0"] + mod.type = PackageType.TXP + mod.author = ruben + mod.forums = 14132 + mod.short_desc = "This is an update of the original PixelBOX texture pack by the brillant artist Gambit" + mod.desc = "This is the long desc" + session.add(mod) + + rel = PackageRelease() + rel.package = mod + rel.title = "v1.0.0" + rel.url = "http://mamadou3.free.fr/Minetest/PixelBOX.zip" + rel.approved = True + session.add(rel) + + metas = {} + for package in Package.query.filter_by(type=PackageType.MOD).all(): + meta = None + try: + meta = metas[package.name] + except KeyError: + meta = MetaPackage(package.name) + session.add(meta) + metas[package.name] = meta + package.provides.append(meta) + + dep = Dependency(food_sweet, meta=metas["food"]) + session.add(dep) diff --git a/app/models.py b/app/models.py index 22a7d25..61e9222 100644 --- a/app/models.py +++ b/app/models.py @@ -114,7 +114,7 @@ class User(db.Model, UserMixin): # User authentication information username = db.Column(db.String(50, collation="NOCASE"), nullable=False, unique=True, index=True) - password = db.Column(db.String(255), nullable=True) + password = db.Column(db.String(255), nullable=False, server_default="") reset_password_token = db.Column(db.String(100), nullable=False, server_default="") rank = db.Column(db.Enum(UserRank)) @@ -799,11 +799,11 @@ class PackageRelease(db.Model): raise Exception("Permission {} is not related to releases".format(perm.name)) -class PackageReview(db.Model): - id = db.Column(db.Integer, primary_key=True) - package_id = db.Column(db.Integer, db.ForeignKey("package.id")) - thread_id = db.Column(db.Integer, db.ForeignKey("thread.id"), nullable=False) - recommend = db.Column(db.Boolean, nullable=False, default=True) +# class PackageReview(db.Model): +# id = db.Column(db.Integer, primary_key=True) +# package_id = db.Column(db.Integer, db.ForeignKey("package.id")) +# thread_id = db.Column(db.Integer, db.ForeignKey("thread.id"), nullable=False) +# recommend = db.Column(db.Boolean, nullable=False, default=True) class PackageScreenshot(db.Model): diff --git a/app/templates/flask_user/login.html b/app/templates/flask_user/login.html index 6214c8c..a134388 100644 --- a/app/templates/flask_user/login.html +++ b/app/templates/flask_user/login.html @@ -15,7 +15,7 @@ Sign in {{ form.hidden_tag() }} {# Username or Email field #} - {% set field = form.username if user_manager.enable_username else form.email %} + {% set field = form.username if user_manager.USER_ENABLE_REGISTER else form.email %}
{# Label on left, "New here? Register." on right #} @@ -31,7 +31,7 @@ Sign in {% set field = form.password %}
{# Remember me #} - {% if user_manager.enable_remember_me %} + {% if user_manager.USER_ENABLE_REMEMBER_ME %} {{ render_checkbox_field(login_form.remember_me, tabindex=130) }} {% endif %} diff --git a/app/tests/test_homepage.py b/app/tests/test_homepage.py new file mode 100644 index 0000000..f0f6793 --- /dev/null +++ b/app/tests/test_homepage.py @@ -0,0 +1,11 @@ +import pytest +from app import app +from utils import client, recreate_db + +def test_homepage_ok(client): + """Start with a blank database.""" + + assert app.config["TESTING"] + + rv = client.get("/") + assert b"No packages available" in rv.data diff --git a/app/tests/utils.py b/app/tests/utils.py new file mode 100644 index 0000000..214630e --- /dev/null +++ b/app/tests/utils.py @@ -0,0 +1,29 @@ +import pytest +from app import app +from app.models import db, User +from app.default_data import populate + +def clear_data(session): + meta = db.metadata + for table in reversed(meta.sorted_tables): + session.execute(f'ALTER TABLE "{table.name}" DISABLE TRIGGER ALL;') + session.execute(table.delete()) + session.execute(f'ALTER TABLE "{table.name}" ENABLE TRIGGER ALL;') + #session.execute(table.delete()) + +def recreate_db(): + clear_data(db.session) + populate(db.session) + db.session.commit() + +@pytest.fixture +def client(): + app.config["TESTING"] = True + + recreate_db() + assert User.query.count() == 1 + + with app.test_client() as client: + yield client + + app.config["TESTING"] = False diff --git a/requirements.txt b/requirements.txt index bae1ce4..f840f58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,3 +21,5 @@ pillow~=7.0 pyScss~=1.3 redis~=3.3 psycopg2~=2.7 + +pytest ~= 5.3 diff --git a/utils/setup.py b/utils/setup.py index bf9536b..fb87fcc 100644 --- a/utils/setup.py +++ b/utils/setup.py @@ -27,360 +27,19 @@ test_data = len(sys.argv) >= 2 and sys.argv[1].strip() == "-t" or not create_db # Allow finding the `app` module currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) parentdir = os.path.dirname(currentdir) -sys.path.insert(0,parentdir) - -from app.models import * -from app.utils import make_flask_user_password - -def defineDummyData(licenses, tags, ruben): - ez = User("Shara") - ez.github_username = "Ezhh" - ez.forums_username = "Shara" - ez.rank = UserRank.EDITOR - db.session.add(ez) - - not1 = Notification(ruben, ez, "Awards approved", "/packages/rubenwardy/awards/") - db.session.add(not1) - - jeija = User("Jeija") - jeija.github_username = "Jeija" - jeija.forums_username = "Jeija" - db.session.add(jeija) - - - mod = Package() - mod.approved = True - mod.name = "alpha" - mod.title = "Alpha Test" - mod.license = licenses["MIT"] - mod.type = PackageType.MOD - mod.author = ruben - mod.tags.append(tags["mapgen"]) - mod.tags.append(tags["environment"]) - mod.repo = "https://github.com/ezhh/other_worlds" - mod.issueTracker = "https://github.com/ezhh/other_worlds/issues" - mod.forums = 16015 - mod.short_desc = "The content library should not be used yet as it is still in alpha" - mod.desc = "This is the long desc" - db.session.add(mod) - - rel = PackageRelease() - rel.package = mod - rel.title = "v1.0.0" - rel.url = "https://github.com/ezhh/handholds/archive/master.zip" - rel.approved = True - db.session.add(rel) - - mod1 = Package() - mod1.approved = True - mod1.name = "awards" - mod1.title = "Awards" - mod1.license = licenses["LGPLv2.1"] - mod1.type = PackageType.MOD - mod1.author = ruben - mod1.tags.append(tags["player_effects"]) - mod1.repo = "https://github.com/rubenwardy/awards" - mod1.issueTracker = "https://github.com/rubenwardy/awards/issues" - mod1.forums = 4870 - mod1.short_desc = "Adds achievements and an API to register new ones." - mod1.desc = """ -Majority of awards are back ported from Calinou's old fork in Carbone, under same license. - -``` -awards.register_achievement("award_mesefind",{ - title = "First Mese Find", - description = "Found some Mese!", - trigger = { - type = "dig", -- award is given when - node = "default:mese", -- this type of node has been dug - target = 1, -- this number of times - }, -}) -``` -""" - - rel = PackageRelease() - rel.package = mod1 - rel.title = "v1.0.0" - rel.url = "https://github.com/rubenwardy/awards/archive/master.zip" - rel.approved = True - db.session.add(rel) - - mod2 = Package() - mod2.approved = True - mod2.name = "mesecons" - mod2.title = "Mesecons" - mod2.tags.append(tags["tools"]) - mod2.type = PackageType.MOD - mod2.license = licenses["LGPLv3"] - mod2.author = jeija - mod2.repo = "https://github.com/minetest-mods/mesecons/" - mod2.issueTracker = "https://github.com/minetest-mods/mesecons/issues" - mod2.forums = 628 - mod2.short_desc = "Mesecons adds everything digital, from all kinds of sensors, switches, solar panels, detectors, pistons, lamps, sound blocks to advanced digital circuitry like logic gates and programmable blocks." - mod2.desc = """ - ######################################################################## - ## __ __ _____ _____ _____ _____ _____ _ _ _____ ## - ## | \ / | | ___| | ___| | ___| | ___| | _ | | \ | | | ___| ## - ## | \/ | | |___ | |___ | |___ | | | | | | | \| | | |___ ## - ## | |\__/| | | ___| |___ | | ___| | | | | | | | | |___ | ## - ## | | | | | |___ ___| | | |___ | |___ | |_| | | |\ | ___| | ## - ## |_| |_| |_____| |_____| |_____| |_____| |_____| |_| \_| |_____| ## - ## ## - ######################################################################## - -MESECONS by Jeija and contributors - -Mezzee-what? ------------- -[Mesecons](http://mesecons.net/)! They're yellow, they're conductive, and they'll add a whole new dimension to Minetest's gameplay. - -Mesecons is a mod for [Minetest](http://minetest.net/) that implements a ton of items related to digital circuitry, such as wires, buttons, lights, and even programmable controllers. Among other things, there are also pistons, solar panels, pressure plates, and note blocks. - -Mesecons has a similar goal to Redstone in Minecraft, but works in its own way, with different rules and mechanics. - -OK, I want in. --------------- -Go get it! - -[DOWNLOAD IT NOW](https://github.com/minetest-mods/mesecons/archive/master.zip) - -Now go ahead and install it like any other Minetest mod. Don't know how? Check out [the wonderful page about it](http://wiki.minetest.com/wiki/Mods) over at the Minetest Wiki. For your convenience, here's a quick summary: - -1. If Mesecons is still in a ZIP file, extract the folder inside to somewhere on the computer. -2. Make sure that when you open the folder, you can directly find `README.md` in the listing. If you just see another folder, move that folder up one level and delete the old one. -3. Open up the Minetest mods folder - usually `/mods/`. If you see the `minetest` or folder inside of that, that is your mod folder instead. -4. Copy the Mesecons folder into the mods folder. - -Don't like some parts of Mesecons? Open up the Mesecons folder and delete the subfolder containing the mod you don't want. If you didn't want movestones, for example, all you have to do is delete the `mesecons_movestones` folder and they will no longer be available. - -There are no dependencies - it will work right after installing! - -How do I use this thing? ------------------------- -How about a [quick overview video](https://www.youtube.com/watch?v=6kmeQj6iW5k)? - -Or maybe a [comprehensive reference](http://mesecons.net/items.html) is your style? - -An overview for the very newest of new beginners? How does [this one](http://uberi.mesecons.net/projects/MeseconsBasics/index.html) look? - -Want to get more into building? Why not check out the [Mesecons Laboratory](http://uberi.mesecons.net/), a website dedicated to advanced Mesecons builders? - -Want to contribute to Mesecons itself? Check out the [source code](https://github.com/minetest-mods/mesecons)! - -Who wrote it anyways? ---------------------- -These awesome people made Mesecons possible! - -| Contributor | Contribution | -| --------------- | -------------------------------- | -| Hawk777 | Code for VoxelManip caching | -| Jat15 | Various tweaks. | -| Jeija | **Main developer! Everything.** | -| Jordach | Noteblock sounds. | -| khonkhortistan | Code, recipes, textures. | -| Kotolegokot | Nodeboxes for items. | -| minerd247 | Textures. | -| Nore/Novatux | Code. | -| RealBadAngel | Fixes, improvements. | -| sfan5 | Code, recipes, textures. | -| suzenako | Piston sounds. | -| Uberi/Temperest | Code, textures, documentation. | -| VanessaE | Code, recipes, textures, design. | -| Whiskers75 | Logic gates implementation. | - -There are also a whole bunch of other people helping with everything from code to testing and feedback. Mesecons would also not be possible without their help! - -Alright, how can I use it? --------------------------- -All textures in this project are licensed under the CC-BY-SA 3.0 (Creative Commons Attribution-ShareAlike 3.0 Generic). That means you can distribute and remix them as much as you want to, under the condition that you give credit to the authors and the project, and that if you remix and release them, they must be under the same or similar license to this one. - -All code in this project is licensed under the LGPL version 3 or later. That means you have unlimited freedom to distribute and modify the work however you see fit, provided that if you decide to distribute it or any modified versions of it, you must also use the same license. The LGPL also grants the additional freedom to write extensions for the software and distribute them without the extensions being subject to the terms of the LGPL, although the software itself retains its license. - -No warranty is provided, express or implied, for any part of the project. - -""" - - db.session.add(mod1) - db.session.add(mod2) - - mod = Package() - mod.approved = True - mod.name = "handholds" - mod.title = "Handholds" - mod.license = licenses["MIT"] - mod.type = PackageType.MOD - mod.author = ez - mod.tags.append(tags["player_effects"]) - mod.repo = "https://github.com/ezhh/handholds" - mod.issueTracker = "https://github.com/ezhh/handholds/issues" - mod.forums = 17069 - mod.short_desc = "Adds hand holds and climbing thingies" - mod.desc = "This is the long desc" - db.session.add(mod) - - rel = PackageRelease() - rel.package = mod - rel.title = "v1.0.0" - rel.url = "https://github.com/ezhh/handholds/archive/master.zip" - rel.approved = True - db.session.add(rel) - - mod = Package() - mod.approved = True - mod.name = "other_worlds" - mod.title = "Other Worlds" - mod.license = licenses["MIT"] - mod.type = PackageType.MOD - mod.author = ez - mod.tags.append(tags["mapgen"]) - mod.tags.append(tags["environment"]) - mod.repo = "https://github.com/ezhh/other_worlds" - mod.issueTracker = "https://github.com/ezhh/other_worlds/issues" - mod.forums = 16015 - mod.short_desc = "Adds space with asteroids and comets" - mod.desc = "This is the long desc" - db.session.add(mod) - - mod = Package() - mod.approved = True - mod.name = "food" - mod.title = "Food" - mod.license = licenses["LGPLv2.1"] - mod.type = PackageType.MOD - mod.author = ruben - mod.tags.append(tags["player_effects"]) - mod.repo = "https://github.com/rubenwardy/food/" - mod.issueTracker = "https://github.com/rubenwardy/food/issues/" - mod.forums = 2960 - mod.short_desc = "Adds lots of food and an API to manage ingredients" - mod.desc = "This is the long desc" - food = mod - db.session.add(mod) - - mod = Package() - mod.approved = True - mod.name = "food_sweet" - mod.title = "Sweet Foods" - mod.license = licenses["CC0"] - mod.type = PackageType.MOD - mod.author = ruben - mod.tags.append(tags["player_effects"]) - mod.repo = "https://github.com/rubenwardy/food_sweet/" - mod.issueTracker = "https://github.com/rubenwardy/food_sweet/issues/" - mod.forums = 9039 - mod.short_desc = "Adds sweet food" - mod.desc = "This is the long desc" - food_sweet = mod - db.session.add(mod) - - game1 = Package() - game1.approved = True - game1.name = "capturetheflag" - game1.title = "Capture The Flag" - game1.type = PackageType.GAME - game1.license = licenses["LGPLv2.1"] - game1.author = ruben - game1.tags.append(tags["pvp"]) - game1.tags.append(tags["survival"]) - game1.tags.append(tags["multiplayer"]) - game1.repo = "https://github.com/rubenwardy/capturetheflag" - game1.issueTracker = "https://github.com/rubenwardy/capturetheflag/issues" - game1.forums = 12835 - game1.short_desc = "Two teams battle to snatch and return the enemy's flag, before the enemy takes their own!" - game1.desc = """ -As seen on the Capture the Flag server (minetest.rubenwardy.com:30000) - -Uses the CTF PvP Engine. -""" - - db.session.add(game1) - - rel = PackageRelease() - rel.package = game1 - rel.title = "v1.0.0" - rel.url = "https://github.com/rubenwardy/capturetheflag/archive/master.zip" - rel.approved = True - db.session.add(rel) - - - mod = Package() - mod.approved = True - mod.name = "pixelbox" - mod.title = "PixelBOX Reloaded" - mod.license = licenses["CC0"] - mod.type = PackageType.TXP - mod.author = ruben - mod.forums = 14132 - mod.short_desc = "This is an update of the original PixelBOX texture pack by the brillant artist Gambit" - mod.desc = "This is the long desc" - db.session.add(mod) - - rel = PackageRelease() - rel.package = mod - rel.title = "v1.0.0" - rel.url = "http://mamadou3.free.fr/Minetest/PixelBOX.zip" - rel.approved = True - db.session.add(rel) - - db.session.commit() - - metas = {} - for package in Package.query.filter_by(type=PackageType.MOD).all(): - meta = None - try: - meta = metas[package.name] - except KeyError: - meta = MetaPackage(package.name) - db.session.add(meta) - metas[package.name] = meta - package.provides.append(meta) - - dep = Dependency(food_sweet, meta=metas["food"]) - db.session.add(dep) +sys.path.insert(0,parentdir) +from app.models import db, User, UserRank +from app.default_data import populate, populate_test_data if delete_db and os.path.isfile("db.sqlite"): os.remove("db.sqlite") - if create_db: print("Creating database tables...") db.create_all() print("Filling database...") - -ruben = User("rubenwardy") -ruben.active = True -ruben.password = make_flask_user_password("tuckfrump") -ruben.github_username = "rubenwardy" -ruben.forums_username = "rubenwardy" -ruben.rank = UserRank.ADMIN -db.session.add(ruben) - -tags = {} -for tag in ["Inventory", "Mapgen", "Building", \ - "Mobs and NPCs", "Tools", "Player effects", \ - "Environment", "Transport", "Maintenance", "Plants and farming", \ - "PvP", "PvE", "Survival", "Creative", "Puzzle", "Multiplayer", "Singleplayer"]: - row = Tag(tag) - tags[row.name] = row - db.session.add(row) - -licenses = {} -for license in ["GPLv2.1", "GPLv3", "LGPLv2.1", "LGPLv3", "AGPLv2.1", "AGPLv3", - "Apache", "BSD 3-Clause", "BSD 2-Clause", "CC0", "CC-BY-SA", - "CC-BY", "MIT", "ZLib", "Other (Free)"]: - row = License(license) - licenses[row.name] = row - db.session.add(row) - -for license in ["CC-BY-NC-SA", "Other (Non-free)"]: - row = License(license, False) - licenses[row.name] = row - db.session.add(row) - +populate(db.session) if test_data: - defineDummyData(licenses, tags, ruben) - -db.session.commit() + populate_test_data(licenses, tags, User.filter_by(rank=UserRank.ADMIN).first()) diff --git a/utils/tests.sh b/utils/tests.sh new file mode 100755 index 0000000..adedcf4 --- /dev/null +++ b/utils/tests.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker exec -it contentdb_app_1 sh -c "FLASK_CONFIG=../config.cfg FLASK_APP=app/__init__.py python -m pytest app/tests/ --disable-warnings"