Forward ported CLI tests from Flask-CLI and fixed a bug with the CLI's name. (#1806)

* Forward port the CLI tests from Flask-CLI.

* Make sure the parameter passed to the CLI's AppGroup is the app's name, not the app itself.

flask/app.py

@@ -546,7 +546,7 @@ class Flask(_PackageBoundObject):
         #: provided by Flask itself and can be overridden.
         #:
         #: This is an instance of a :class:`click.Group` object.
-        self.cli = cli.AppGroup(self)
+        self.cli = cli.AppGroup(self.name)
 
     def _get_error_handlers(self):
         from warnings import warn

tests/test_apps/cliapp/app.py

@@ -0,0 +1,5 @@
+from __future__ import absolute_import, print_function
+
+from flask import Flask
+
+testapp = Flask('testapp')

tests/test_apps/cliapp/multiapp.py

@@ -0,0 +1,6 @@
+from __future__ import absolute_import, print_function
+
+from flask import Flask
+
+app1 = Flask('app1')
+app2 = Flask('app2')

tests/test_cli.py

@@ -0,0 +1,137 @@
+# -*- coding: utf-8 -*-
+"""
+    tests.test_cli
+    ~~~~~~~~~~~~~~
+
+    :copyright: (c) 2016 by the Flask Team, see AUTHORS for more details.
+    :license: BSD, see LICENSE for more details.
+"""
+#
+# This file was part of Flask-CLI and was modified under the terms its license,
+# the Revised BSD License.
+# Copyright (C) 2015 CERN.
+#
+from __future__ import absolute_import, print_function
+
+import click
+import pytest
+from click.testing import CliRunner
+from flask import Flask, current_app
+
+from flask.cli import AppGroup, FlaskGroup, NoAppException, ScriptInfo, \
+    find_best_app, locate_app, script_info_option, with_appcontext
+
+
+def test_cli_name(test_apps):
+    "Make sure the CLI object's name is the app's name and not the app itself"
+    from cliapp.app import testapp
+    assert testapp.cli.name == testapp.name
+
+
+def test_find_best_app(test_apps):
+    """Test of find_best_app."""
+    class mod:
+        app = Flask('appname')
+    assert find_best_app(mod) == mod.app
+
+    class mod:
+        application = Flask('appname')
+    assert find_best_app(mod) == mod.application
+
+    class mod:
+        myapp = Flask('appname')
+    assert find_best_app(mod) == mod.myapp
+
+    class mod:
+        myapp = Flask('appname')
+        myapp2 = Flask('appname2')
+
+    pytest.raises(NoAppException, find_best_app, mod)
+
+
+def test_locate_app(test_apps):
+    """Test of locate_app."""
+    assert locate_app("cliapp.app").name == "testapp"
+    assert locate_app("cliapp.app:testapp").name == "testapp"
+    assert locate_app("cliapp.multiapp:app1").name == "app1"
+    pytest.raises(RuntimeError, locate_app, "cliapp.app:notanapp")
+
+
+def test_scriptinfo(test_apps):
+    """Test of ScriptInfo."""
+    obj = ScriptInfo(app_import_path="cliapp.app:testapp")
+    assert obj.load_app().name == "testapp"
+    assert obj.load_app().name == "testapp"
+
+    def create_app(info):
+        return Flask("createapp")
+
+    obj = ScriptInfo(create_app=create_app)
+    app = obj.load_app()
+    assert app.name == "createapp"
+    assert obj.load_app() == app
+
+
+def test_with_appcontext():
+    """Test of with_appcontext."""
+    @click.command()
+    @with_appcontext
+    def testcmd():
+        click.echo(current_app.name)
+
+    obj = ScriptInfo(create_app=lambda info: Flask("testapp"))
+
+    runner = CliRunner()
+    result = runner.invoke(testcmd, obj=obj)
+    assert result.exit_code == 0
+    assert result.output == 'testapp\n'
+
+
+def test_appgroup():
+    """Test of with_appcontext."""
+    @click.group(cls=AppGroup)
+    def cli():
+        pass
+
+    @cli.command(with_appcontext=True)
+    def test():
+        click.echo(current_app.name)
+
+    @cli.group()
+    def subgroup():
+        pass
+
+    @subgroup.command(with_appcontext=True)
+    def test2():
+        click.echo(current_app.name)
+
+    obj = ScriptInfo(create_app=lambda info: Flask("testappgroup"))
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ['test'], obj=obj)
+    assert result.exit_code == 0
+    assert result.output == 'testappgroup\n'
+
+    result = runner.invoke(cli, ['subgroup', 'test2'], obj=obj)
+    assert result.exit_code == 0
+    assert result.output == 'testappgroup\n'
+
+
+def test_flaskgroup():
+    """Test FlaskGroup."""
+    def create_app(info):
+        return Flask("flaskgroup")
+
+    @click.group(cls=FlaskGroup, create_app=create_app)
+    @script_info_option('--config', script_info_key='config')
+    def cli(**params):
+        pass
+
+    @cli.command()
+    def test():
+        click.echo(current_app.name)
+
+    runner = CliRunner()
+    result = runner.invoke(cli, ['test'])
+    assert result.exit_code == 0
+    assert result.output == 'flaskgroup\n'