orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

relax routes cli match order

Browse source
This commit is contained in:
David Lord 2022-07-02 21:02:00 -07:00
parent 12d3f4fdf0
commit ab6a8b0330
No known key found for this signature in database
GPG key ID: 7A1C87E3F5BC42A8
1 changed files with 16 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tests/test_cli.py
View file

@ -422,22 +422,23 @@ def test_help_echo_exception():
class TestRoutes: class TestRoutes:
@pytest.fixture @pytest.fixture
def invoke(self, runner): def app(self):
def create_app(): app = Flask(__name__)
app = Flask(__name__) app.testing = True
app.testing = True
@app.route("/get_post/<int:x>/<int:y>", methods=["GET", "POST"]) @app.route("/get_post/<int:x>/<int:y>", methods=["GET", "POST"])
def yyy_get_post(x, y): def yyy_get_post(x, y):
pass pass
@app.route("/zzz_post", methods=["POST"]) @app.route("/zzz_post", methods=["POST"])
def aaa_post(): def aaa_post():
pass pass
return app return app
cli = FlaskGroup(create_app=create_app) @pytest.fixture
def invoke(self, app, runner):
cli = FlaskGroup(create_app=lambda: app)
return partial(runner.invoke, cli) return partial(runner.invoke, cli)
@pytest.fixture @pytest.fixture
@ -462,7 +463,7 @@ class TestRoutes:
assert result.exit_code == 0 assert result.exit_code == 0
self.expect_order(["aaa_post", "static", "yyy_get_post"], result.output) self.expect_order(["aaa_post", "static", "yyy_get_post"], result.output)
def test_sort(self, invoke): def test_sort(self, app, invoke):
default_output = invoke(["routes"]).output default_output = invoke(["routes"]).output
endpoint_output = invoke(["routes", "-s", "endpoint"]).output endpoint_output = invoke(["routes", "-s", "endpoint"]).output
assert default_output == endpoint_output assert default_output == endpoint_output
@ -474,10 +475,8 @@ class TestRoutes:
["yyy_get_post", "static", "aaa_post"], ["yyy_get_post", "static", "aaa_post"],
invoke(["routes", "-s", "rule"]).output, invoke(["routes", "-s", "rule"]).output,
) )
self.expect_order( match_order = [r.endpoint for r in app.url_map.iter_rules()]
["aaa_post", "yyy_get_post", "static"], self.expect_order(match_order, invoke(["routes", "-s", "match"]).output)
invoke(["routes", "-s", "match"]).output,
)
def test_all_methods(self, invoke): def test_all_methods(self, invoke):
output = invoke(["routes"]).output output = invoke(["routes"]).output