From 99c007d48c25aefb541ec7486147751937a34f5c Mon Sep 17 00:00:00 2001 From: finswimmer Date: Sat, 20 Jun 2020 20:33:05 +0200 Subject: [PATCH] fix (test_init): fix tests after rebase --- tests/console/commands/test_init.py | 142 +++++++++++++--------------- 1 file changed, 67 insertions(+), 75 deletions(-) diff --git a/tests/console/commands/test_init.py b/tests/console/commands/test_init.py index b6c7b783d54..be6a93de63a 100644 --- a/tests/console/commands/test_init.py +++ b/tests/console/commands/test_init.py @@ -450,22 +450,19 @@ def test_predefined_dependency(app, repo, mocker, poetry): p.return_value = Path(__file__) tester = CommandTester(command) - tester.set_inputs( - [ - "my-package", # Package name - "1.2.3", # Version - "This is a description", # Description - "n", # Author - "MIT", # License - "~2.7 || ^3.6", # Python - "n", # Interactive packages - "n", # Interactive dev packages - "\n", # Generate - ] - ) - tester.execute([("command", command.name), ("--dependency", ["pendulum"])]) + inputs = [ + "my-package", # Package name + "1.2.3", # Version + "This is a description", # Description + "n", # Author + "MIT", # License + "~2.7 || ^3.6", # Python + "n", # Interactive packages + "n", # Interactive dev packages + "\n", # Generate + ] + tester.execute("--dependency pendulum", inputs="\n".join(inputs)) - output = tester.get_display(True) expected = """\ [tool.poetry] name = "my-package" @@ -476,12 +473,12 @@ def test_predefined_dependency(app, repo, mocker, poetry): [tool.poetry.dependencies] python = "~2.7 || ^3.6" -pendulum = "^2.0" +pendulum = "^2.0.0" [tool.poetry.dev-dependencies] """ - assert expected in output + assert expected in tester.io.fetch_output() def test_predefined_and_interactive_dependencies(app, repo, mocker, poetry): @@ -496,26 +493,24 @@ def test_predefined_and_interactive_dependencies(app, repo, mocker, poetry): p.return_value = Path(__file__) tester = CommandTester(command) - tester.set_inputs( - [ - "my-package", # Package name - "1.2.3", # Version - "This is a description", # Description - "n", # Author - "MIT", # License - "~2.7 || ^3.6", # Python - "", # Interactive packages - "pyramid", # Search for package - "0", # First option - "", # Do not set constraint - "", # Stop searching for packages - "n", # Interactive dev packages - "\n", # Generate - ] - ) - tester.execute([("command", command.name), ("--dependency", ["pendulum"])]) + inputs = [ + "my-package", # Package name + "1.2.3", # Version + "This is a description", # Description + "n", # Author + "MIT", # License + "~2.7 || ^3.6", # Python + "", # Interactive packages + "pyramid", # Search for package + "0", # First option + "", # Do not set constraint + "", # Stop searching for packages + "n", # Interactive dev packages + "\n", # Generate + ] + + tester.execute("--dependency pendulum", inputs="\n".join(inputs)) - output = tester.get_display(True) expected = """\ [tool.poetry] name = "my-package" @@ -527,9 +522,9 @@ def test_predefined_and_interactive_dependencies(app, repo, mocker, poetry): [tool.poetry.dependencies] python = "~2.7 || ^3.6" """ - + output = tester.io.fetch_output() assert expected in output - assert 'pendulum = "^2.0"' in output + assert 'pendulum = "^2.0.0"' in output assert 'pyramid = "^1.10"' in output @@ -544,22 +539,20 @@ def test_predefined_dev_dependency(app, repo, mocker, poetry): p.return_value = Path(__file__) tester = CommandTester(command) - tester.set_inputs( - [ - "my-package", # Package name - "1.2.3", # Version - "This is a description", # Description - "n", # Author - "MIT", # License - "~2.7 || ^3.6", # Python - "n", # Interactive packages - "n", # Interactive dev packages - "\n", # Generate - ] - ) - tester.execute([("command", command.name), ("--dev-dependency", ["pytest"])]) + inputs = [ + "my-package", # Package name + "1.2.3", # Version + "This is a description", # Description + "n", # Author + "MIT", # License + "~2.7 || ^3.6", # Python + "n", # Interactive packages + "n", # Interactive dev packages + "\n", # Generate + ] + + tester.execute("--dev-dependency pytest", inputs="\n".join(inputs)) - output = tester.get_display(True) expected = """\ [tool.poetry] name = "my-package" @@ -572,10 +565,10 @@ def test_predefined_dev_dependency(app, repo, mocker, poetry): python = "~2.7 || ^3.6" [tool.poetry.dev-dependencies] -pytest = "^3.6" +pytest = "^3.6.0" """ - assert expected in output + assert expected in tester.io.fetch_output() def test_predefined_and_interactive_dev_dependencies(app, repo, mocker, poetry): @@ -590,26 +583,24 @@ def test_predefined_and_interactive_dev_dependencies(app, repo, mocker, poetry): p.return_value = Path(__file__) tester = CommandTester(command) - tester.set_inputs( - [ - "my-package", # Package name - "1.2.3", # Version - "This is a description", # Description - "n", # Author - "MIT", # License - "~2.7 || ^3.6", # Python - "n", # Interactive packages - "", # Interactive dev packages - "pytest-requests", # Search for package - "0", # Select first option - "", # Do not set constraint - "", # Stop searching for dev packages - "\n", # Generate - ] - ) - tester.execute([("command", command.name), ("--dev-dependency", ["pytest"])]) + inputs = [ + "my-package", # Package name + "1.2.3", # Version + "This is a description", # Description + "n", # Author + "MIT", # License + "~2.7 || ^3.6", # Python + "n", # Interactive packages + "", # Interactive dev packages + "pytest-requests", # Search for package + "0", # Select first option + "", # Do not set constraint + "", # Stop searching for dev packages + "\n", # Generate + ] + + tester.execute("--dev-dependency pytest", inputs="\n".join(inputs)) - output = tester.get_display(True) expected = """\ [tool.poetry] name = "my-package" @@ -624,6 +615,7 @@ def test_predefined_and_interactive_dev_dependencies(app, repo, mocker, poetry): [tool.poetry.dev-dependencies] """ + output = tester.io.fetch_output() assert expected in output assert 'pytest-requests = "^0.2.0"' in output - assert 'pytest = "^3.6"' in output + assert 'pytest = "^3.6.0"' in output