Merge branch 'develop' into VC_determine_delta

Author: pratik0316

configure.bat

@@ -89,7 +89,7 @@ call mkdir "%CFG_ROOT_DIR%tmp"
 call curl -o "%CFG_ROOT_DIR%tmp\virtualenv.pyz" https://bootstrap.pypa.io/virtualenv.pyz
 call %PYTHON_EXECUTABLE% "%CFG_ROOT_DIR%tmp\virtualenv.pyz" "%CFG_ROOT_DIR%tmp"
 call "%CFG_ROOT_DIR%tmp\Scripts\activate"
-call "%CFG_ROOT_DIR%tmp\Scripts\pip" install --upgrade pip virtualenv setuptools wheel
+call "%PYTHON_EXECUTABLE%" -m pip install --upgrade pip virtualenv setuptools wheel
 call "%CFG_ROOT_DIR%tmp\Scripts\pip" install -e .[testing]
 
 @rem Return a proper return code on failure

tests/test_cli.py

@@ -39,6 +39,7 @@
 from deltacode import DeltaCode
 from deltacode import utils
 
+TERMINAL_WIDTH = 1000
 
 def load_csv(location):
     """
@@ -83,9 +84,9 @@ def test_json_output_option_selected_all_selected(self):
         result_file = self.get_temp_file("json")
 
         runner = CliRunner()
-        result = runner.invoke(
-            cli.cli, ["-n", new_scan, "-o", old_scan, "-j", result_file, "-a"]
-        )
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan, '-j', result_file, '-a'], terminal_width=TERMINAL_WIDTH)
+
 
         assert result.exit_code == 0
 
@@ -248,9 +249,9 @@ def test_json_output_option_selected_all_not_selected(self):
         result_file = self.get_temp_file("json")
 
         runner = CliRunner()
-        result = runner.invoke(
-            cli.cli, ["-n", new_scan, "-o", old_scan, "-j", result_file]
-        )
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan, '-j', result_file], terminal_width=TERMINAL_WIDTH)
+
 
         assert result.exit_code == 0
 
@@ -351,7 +352,9 @@ def test_no_output_option_selected_all_selected(self):
         old_scan = self.get_test_loc("cli/scan_1_file_moved_old.json")
 
         runner = CliRunner()
-        result = runner.invoke(cli.cli, ["-n", new_scan, "-o", old_scan, "-a"])
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan, '-a'], terminal_width=TERMINAL_WIDTH)
+
 
         assert result.exit_code == 0
 
@@ -397,7 +400,9 @@ def test_no_output_option_selected_all_not_selected(self):
         old_scan = self.get_test_loc("cli/scan_1_file_moved_old.json")
 
         runner = CliRunner()
-        result = runner.invoke(cli.cli, ["-n", new_scan, "-o", old_scan])
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan], terminal_width=TERMINAL_WIDTH)
+
 
         assert result.exit_code == 0
 
@@ -442,9 +447,9 @@ def test_json_deltas_count_all_selected(self):
         result_file = self.get_temp_file("json")
 
         runner = CliRunner()
-        result = runner.invoke(
-            cli.cli, ["-n", new_scan, "-o", old_scan, "-j", result_file, "-a"]
-        )
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan, '-j', result_file, '-a'], terminal_width=TERMINAL_WIDTH)
+
 
         json_result = json.load(open(result_file))
 
@@ -457,17 +462,18 @@ def test_json_deltas_count_all_not_selected(self):
         result_file = self.get_temp_file("json")
 
         runner = CliRunner()
-        result = runner.invoke(
-            cli.cli, ["-n", new_scan, "-o", old_scan, "-j", result_file]
-        )
+
+        result = runner.invoke(cli.cli, ['-n', new_scan, '-o',  old_scan, '-j', result_file], terminal_width=TERMINAL_WIDTH)
 
         json_result = json.load(open(result_file))
 
         assert json_result.get("deltas_count") == 4
 
     def test_help(self):
         runner = CliRunner()
-        result = runner.invoke(cli.cli, ["--help"])
+
+        result = runner.invoke(cli.cli, ['--help'], terminal_width=TERMINAL_WIDTH)
+
 
         assert "Usage: cli [OPTIONS]" in result.output
         assert "Identify the changes that need to be made" in result.output
@@ -478,19 +484,25 @@ def test_help(self):
 
     def test_version(self):
         runner = CliRunner()
-        result = runner.invoke(cli.cli, ["--version"])
+
+        result = runner.invoke(cli.cli, ['--version'], terminal_width=TERMINAL_WIDTH)
+
 
         assert "DeltaCode version" in result.output
 
     def test_empty(self):
         runner = CliRunner()
-        result = runner.invoke(cli.cli, [])
 
-        assert "Usage: cli [OPTIONS]" in result.output
+        result = runner.invoke(cli.cli, [], terminal_width=TERMINAL_WIDTH)
+        
+        assert 'Usage: cli [OPTIONS]' in result.output
+
         assert "Error: Missing option '-n' / '--new'." in result.output
 
     def test_incorrect_flag(self):
         runner = CliRunner()
-        result = runner.invoke(cli.cli, ["-xyz"])
 
-        assert "Error: No such option: -x" in result.output
+        result = runner.invoke(cli.cli, ['-xyz'], terminal_width=TERMINAL_WIDTH)
+
+        assert 'Error: No such option: -x' in result.output
+