Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade jsdiff to v1.4.0 #1699

Merged
merged 1 commit into from
May 13, 2015
Merged

Upgrade jsdiff to v1.4.0 #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"dependencies": {
"commander": "2.3.0",
"debug": "2.0.0",
"diff": "1.0.8",
"diff": "1.4.0",
"escape-string-regexp": "1.0.2",
"glob": "3.2.3",
"growl": "1.8.1",
Expand Down
30 changes: 15 additions & 15 deletions test/integration/fixtures/diffs/output
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,67 +1,67 @@
// DIFF
+foo bar baz
-foo rar baz
+foo bar baz

// DIFF
{
"age": 23
+ "name": "travis"
- "name": "travis j"
+ "name": "travis"
}

// DIFF
foo bar baz
+foo bar baz
+foo bar baz
-foo rar baz
-foo bar raz
+foo bar baz
+foo bar baz

// DIFF
{
"address": {
"city": "new york"
+ "country": "us"
- "country": "usa"
+ "country": "us"
}
"age": 30
+ "name": "joe"
- "name": "joel"
+ "name": "joe"
}

// DIFF
one two three
+four five six
-four zzzz six
+four five six
seven eight nine

// DIFF
{
"address": {
"city": "new york"
+ "country": "us"
- "country": "usa"
+ "country": "us"
}
"age": 30
+ "name": "joe"
- "name": "joel"
+ "name": "joe"
}

// DIFF
one tab
+two tabs
-two tabs
+two tabs

// DIFF
body {
font: "Helvetica Neue", Helvetica, arial, sans-serif;
background: black;
+ color: #fff;
- color: white;
+ color: #fff;
}

a {
+ color: blue;
- color: blue
+ color: blue;
}
+
+foo {
Expand All @@ -71,10 +71,10 @@
// DIFF
{
"age": 2
+ "color": "brown"
+ "name": "loki"
- "color": "white"
- "name": "tobi"
+ "color": "brown"
+ "name": "loki"
"species": "ferret"
}

Expand All @@ -86,6 +86,6 @@

// DIFF
[
+ 2
- 1
+ 2
]