diff options
| author | Austin Ziegler <austin@zieglers.ca> | 2019-02-02 22:52:28 -0500 |
|---|---|---|
| committer | Austin Ziegler <austin@zieglers.ca> | 2019-02-04 10:33:18 -0500 |
| commit | 15169228be42559f98fa6729d5f6bb32edad44e3 (patch) | |
| tree | 0fe1626255811fae6b3c85ce406f0dc02c4987a2 /spec/fixtures/ldiff | |
| parent | 3a89de07745fea52f611e6955f61c11ffd68c754 (diff) | |
| download | diff-lcs-15169228be42559f98fa6729d5f6bb32edad44e3.tar.gz | |
Resolve multiple issues for 1.4
- Resolve ldiff output issues: Resolves #5 and #6 by adding system-output
comparison calls to `bin/ldiff` compared against some pre-generated output.
There is some timestamp manipulation involved with the output comparison,
as the timestamps are unstable because of the way that git clone works.
- Resolved a problem with bin/ldiff --context output.
- Resolved a Numeric/Integer OptParse issue: later versions of Ruby had
problems working with an `OptParse` option specification of `Numeric`; this
has been changed to `Integer`.
Diffstat (limited to 'spec/fixtures/ldiff')
| -rw-r--r-- | spec/fixtures/ldiff/output.diff | 4 | ||||
| -rw-r--r-- | spec/fixtures/ldiff/output.diff-c | 7 | ||||
| -rw-r--r-- | spec/fixtures/ldiff/output.diff-e | 3 | ||||
| -rw-r--r-- | spec/fixtures/ldiff/output.diff-f | 3 | ||||
| -rw-r--r-- | spec/fixtures/ldiff/output.diff-u | 5 |
5 files changed, 22 insertions, 0 deletions
diff --git a/spec/fixtures/ldiff/output.diff b/spec/fixtures/ldiff/output.diff new file mode 100644 index 0000000..fa1a347 --- /dev/null +++ b/spec/fixtures/ldiff/output.diff @@ -0,0 +1,4 @@ +1c1 +< aX +--- +> bXaX diff --git a/spec/fixtures/ldiff/output.diff-c b/spec/fixtures/ldiff/output.diff-c new file mode 100644 index 0000000..92ea5a2 --- /dev/null +++ b/spec/fixtures/ldiff/output.diff-c @@ -0,0 +1,7 @@ +*** spec/fixtures/aX 2019-02-01 22:29:34.000000000 -0500 +--- spec/fixtures/bXaX 2019-02-01 22:29:43.000000000 -0500 +*************** +*** 1 **** +! aX +--- 1 ---- +! bXaX diff --git a/spec/fixtures/ldiff/output.diff-e b/spec/fixtures/ldiff/output.diff-e new file mode 100644 index 0000000..13e0f7f --- /dev/null +++ b/spec/fixtures/ldiff/output.diff-e @@ -0,0 +1,3 @@ +1c +bXaX +. diff --git a/spec/fixtures/ldiff/output.diff-f b/spec/fixtures/ldiff/output.diff-f new file mode 100644 index 0000000..77710c7 --- /dev/null +++ b/spec/fixtures/ldiff/output.diff-f @@ -0,0 +1,3 @@ +c1 +bXaX +. diff --git a/spec/fixtures/ldiff/output.diff-u b/spec/fixtures/ldiff/output.diff-u new file mode 100644 index 0000000..c4ba30f --- /dev/null +++ b/spec/fixtures/ldiff/output.diff-u @@ -0,0 +1,5 @@ +--- spec/fixtures/aX 2019-02-01 22:29:34.000000000 -0500 ++++ spec/fixtures/bXaX 2019-02-01 22:29:43.000000000 -0500 +@@ -1 +1 @@ +-aX ++bXaX |