Skip to content

Commit

Permalink
Enhancement: Use fixtures
Browse files Browse the repository at this point in the history
  • Loading branch information
localheinz committed Dec 27, 2022
1 parent c59b2bc commit bff2903
Show file tree
Hide file tree
Showing 26 changed files with 375 additions and 255 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"conflict":{},"foo":{"qux":"quux","bar":"baz"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"conflict": {},
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"conflict":{"branch\/main":"dev-main","branch\/main-referencing-commit":"dev-main#bf2eeff","branch\/main-referencing-commit-untrimmed":"dev-main#bf2eeff","branch\/main-untrimmed":"dev-main","branch\/my-feature":"dev-my-feature","branch\/my-feature-untrimmed":"dev-my-feature","exact\/major":"1","exact\/major-minor":"1.2","exact\/major-minor-patch":"1.2.3","exact\/major-minor-patch-untrimmed":"1.2.3","exact\/major-minor-untrimmed":"1.2","exact\/major-untrimmed":"1","version-range\/caret-major":"^1","version-range\/caret-major-minor":"^1.2","version-range\/caret-major-minor-patch":"^1.2.3","version-range\/caret-major-minor-patch-untrimmed":"^1.2.3","version-range\/caret-major-minor-untrimmed":"^1.2","version-range\/caret-major-untrimmed":"^1","version-range\/hyphen-surrounded-by-space-double":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-double-untrimmed":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single-untrimmed":"1.0 - 2.0","version-range\/lower":">=1.0","version-range\/lower-and-upper-with-comma":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower":">=1.0,<1.1 || || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-space-double":">=1.0 <2.0","version-range\/lower-and-upper-with-space-double-untrimmed":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single-or-lower":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-or-lower-untrimmed":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-untrimmed":">=1.0 <2.0","version-range\/lower-untrimmed":">=1.0","version-range\/tilde-major":"~1","version-range\/tilde-major-minor":"~1.2","version-range\/tilde-major-minor-patch":"~1.2.3","version-range\/tilde-major-minor-patch-untrimmed":"~1.2.3","version-range\/tilde-major-minor-untrimmed":"~1.2","version-range\/tilde-major-untrimmed":"~1","version-range\/upper":"<2.0","version-range\/upper-untrimmed":"<2.0"},"foo":{"qux":"quux","bar":"baz"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"conflict": {
"branch/main": "dev-main",
"branch/main-referencing-commit": "dev-main#bf2eeff",
"branch/main-referencing-commit-untrimmed": "dev-main#bf2eeff",
"branch/main-untrimmed": " dev-main ",
"branch/my-feature": "dev-my-feature",
"branch/my-feature-untrimmed": " dev-my-feature ",
"exact/major": "1",
"exact/major-minor": "1.2",
"exact/major-minor-patch": "1.2.3",
"exact/major-minor-patch-untrimmed": " 1.2.3 ",
"exact/major-minor-untrimmed": " 1.2 ",
"exact/major-untrimmed": " 1 ",
"version-range/caret-major":"^1",
"version-range/caret-major-minor":"^1.2",
"version-range/caret-major-minor-patch":"^1.2.3",
"version-range/caret-major-minor-patch-untrimmed":" ^1.2.3 ",
"version-range/caret-major-minor-untrimmed":" ^1.2 ",
"version-range/caret-major-untrimmed":" ^1 ",
"version-range/hyphen-surrounded-by-space-double": "1.0 - 2.0",
"version-range/hyphen-surrounded-by-space-double-untrimmed": " 1.0 - 2.0 ",
"version-range/hyphen-surrounded-by-space-single": "1.0 - 2.0",
"version-range/hyphen-surrounded-by-space-single-untrimmed": " 1.0 - 2.0 ",
"version-range/lower": ">=1.0",
"version-range/lower-and-upper-with-comma": ">=1.0,<2.0",
"version-range/lower-and-upper-with-comma-or-lower": ">=1.0,<1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-or-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-double-lower": ">=1.0,<1.1||>=1.2",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-double-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-single-lower": ">=1.0,<1.1 | |>=1.2",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-single-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-surrounded-by-space-double-or-lower": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-double-or-lower-untrimmed": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single": ">=1.0 , <2.0",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-or-lower": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-or-lower-untrimmed": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-untrimmed": " >=1.0 , <2.0 ",
"version-range/lower-and-upper-with-comma-untrimmed": " >=1.0,<2.0 ",
"version-range/lower-and-upper-with-space-double": ">=1.0 <2.0",
"version-range/lower-and-upper-with-space-double-untrimmed": " >=1.0 <2.0 ",
"version-range/lower-and-upper-with-space-single": ">=1.0 <2.0",
"version-range/lower-and-upper-with-space-single-or-lower": ">=1.0 <1.1 || >=1.2",
"version-range/lower-and-upper-with-space-single-or-lower-untrimmed": " >=1.0 <1.1 || >=1.2 ",
"version-range/lower-and-upper-with-space-single-untrimmed": " >=1.0 <2.0 ",
"version-range/lower-untrimmed": " >=1.0 ",
"version-range/tilde-major": "~1",
"version-range/tilde-major-minor": "~1.2",
"version-range/tilde-major-minor-patch": "~1.2.3",
"version-range/tilde-major-minor-patch-untrimmed": " ~1.2.3 ",
"version-range/tilde-major-minor-untrimmed": " ~1.2 ",
"version-range/tilde-major-untrimmed": " ~1 ",
"version-range/upper": "<2.0",
"version-range/upper-untrimmed": " <2.0 "
},
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"provide":{},"foo":{"qux":"quux","bar":"baz"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"provide": {},
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"provide":{"branch\/main":"dev-main","branch\/main-referencing-commit":"dev-main#bf2eeff","branch\/main-referencing-commit-untrimmed":"dev-main#bf2eeff","branch\/main-untrimmed":"dev-main","branch\/my-feature":"dev-my-feature","branch\/my-feature-untrimmed":"dev-my-feature","exact\/major":"1","exact\/major-minor":"1.2","exact\/major-minor-patch":"1.2.3","exact\/major-minor-patch-untrimmed":"1.2.3","exact\/major-minor-untrimmed":"1.2","exact\/major-untrimmed":"1","version-range\/caret-major":"^1","version-range\/caret-major-minor":"^1.2","version-range\/caret-major-minor-patch":"^1.2.3","version-range\/caret-major-minor-patch-untrimmed":"^1.2.3","version-range\/caret-major-minor-untrimmed":"^1.2","version-range\/caret-major-untrimmed":"^1","version-range\/hyphen-surrounded-by-space-double":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-double-untrimmed":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single-untrimmed":"1.0 - 2.0","version-range\/lower":">=1.0","version-range\/lower-and-upper-with-comma":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower":">=1.0,<1.1 || || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-space-double":">=1.0 <2.0","version-range\/lower-and-upper-with-space-double-untrimmed":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single-or-lower":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-or-lower-untrimmed":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-untrimmed":">=1.0 <2.0","version-range\/lower-untrimmed":">=1.0","version-range\/tilde-major":"~1","version-range\/tilde-major-minor":"~1.2","version-range\/tilde-major-minor-patch":"~1.2.3","version-range\/tilde-major-minor-patch-untrimmed":"~1.2.3","version-range\/tilde-major-minor-untrimmed":"~1.2","version-range\/tilde-major-untrimmed":"~1","version-range\/upper":"<2.0","version-range\/upper-untrimmed":"<2.0"},"foo":{"qux":"quux","bar":"baz"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"provide": {
"branch/main": "dev-main",
"branch/main-referencing-commit": "dev-main#bf2eeff",
"branch/main-referencing-commit-untrimmed": "dev-main#bf2eeff",
"branch/main-untrimmed": " dev-main ",
"branch/my-feature": "dev-my-feature",
"branch/my-feature-untrimmed": " dev-my-feature ",
"exact/major": "1",
"exact/major-minor": "1.2",
"exact/major-minor-patch": "1.2.3",
"exact/major-minor-patch-untrimmed": " 1.2.3 ",
"exact/major-minor-untrimmed": " 1.2 ",
"exact/major-untrimmed": " 1 ",
"version-range/caret-major":"^1",
"version-range/caret-major-minor":"^1.2",
"version-range/caret-major-minor-patch":"^1.2.3",
"version-range/caret-major-minor-patch-untrimmed":" ^1.2.3 ",
"version-range/caret-major-minor-untrimmed":" ^1.2 ",
"version-range/caret-major-untrimmed":" ^1 ",
"version-range/hyphen-surrounded-by-space-double": "1.0 - 2.0",
"version-range/hyphen-surrounded-by-space-double-untrimmed": " 1.0 - 2.0 ",
"version-range/hyphen-surrounded-by-space-single": "1.0 - 2.0",
"version-range/hyphen-surrounded-by-space-single-untrimmed": " 1.0 - 2.0 ",
"version-range/lower": ">=1.0",
"version-range/lower-and-upper-with-comma": ">=1.0,<2.0",
"version-range/lower-and-upper-with-comma-or-lower": ">=1.0,<1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-or-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-double-lower": ">=1.0,<1.1||>=1.2",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-double-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-single-lower": ">=1.0,<1.1 | |>=1.2",
"version-range/lower-and-upper-with-comma-or-surrounded-by-space-single-lower-untrimmed": " >=1.0,<1.1 || >=1.2 ",
"version-range/lower-and-upper-with-comma-surrounded-by-space-double-or-lower": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-double-or-lower-untrimmed": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single": ">=1.0 , <2.0",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-or-lower": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-or-lower-untrimmed": ">=1.0 , <1.1 || >=1.2",
"version-range/lower-and-upper-with-comma-surrounded-by-space-single-untrimmed": " >=1.0 , <2.0 ",
"version-range/lower-and-upper-with-comma-untrimmed": " >=1.0,<2.0 ",
"version-range/lower-and-upper-with-space-double": ">=1.0 <2.0",
"version-range/lower-and-upper-with-space-double-untrimmed": " >=1.0 <2.0 ",
"version-range/lower-and-upper-with-space-single": ">=1.0 <2.0",
"version-range/lower-and-upper-with-space-single-or-lower": ">=1.0 <1.1 || >=1.2",
"version-range/lower-and-upper-with-space-single-or-lower-untrimmed": " >=1.0 <1.1 || >=1.2 ",
"version-range/lower-and-upper-with-space-single-untrimmed": " >=1.0 <2.0 ",
"version-range/lower-untrimmed": " >=1.0 ",
"version-range/tilde-major": "~1",
"version-range/tilde-major-minor": "~1.2",
"version-range/tilde-major-minor-patch": "~1.2.3",
"version-range/tilde-major-minor-patch-untrimmed": " ~1.2.3 ",
"version-range/tilde-major-minor-untrimmed": " ~1.2 ",
"version-range/tilde-major-untrimmed": " ~1 ",
"version-range/upper": "<2.0",
"version-range/upper-untrimmed": " <2.0 "
},
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"replace":{},"foo":{"qux":"quux","bar":"baz"}}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": {},
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"foo": {
"qux": "quux",
"bar": "baz"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"replace":{"branch\/main":"dev-main","branch\/main-referencing-commit":"dev-main#bf2eeff","branch\/main-referencing-commit-untrimmed":"dev-main#bf2eeff","branch\/main-untrimmed":"dev-main","branch\/my-feature":"dev-my-feature","branch\/my-feature-untrimmed":"dev-my-feature","exact\/major":"1","exact\/major-minor":"1.2","exact\/major-minor-patch":"1.2.3","exact\/major-minor-patch-untrimmed":"1.2.3","exact\/major-minor-untrimmed":"1.2","exact\/major-untrimmed":"1","version-range\/caret-major":"^1","version-range\/caret-major-minor":"^1.2","version-range\/caret-major-minor-patch":"^1.2.3","version-range\/caret-major-minor-patch-untrimmed":"^1.2.3","version-range\/caret-major-minor-untrimmed":"^1.2","version-range\/caret-major-untrimmed":"^1","version-range\/hyphen-surrounded-by-space-double":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-double-untrimmed":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single":"1.0 - 2.0","version-range\/hyphen-surrounded-by-space-single-untrimmed":"1.0 - 2.0","version-range\/lower":">=1.0","version-range\/lower-and-upper-with-comma":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-double-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower":">=1.0,<1.1 || || >=1.2","version-range\/lower-and-upper-with-comma-or-surrounded-by-space-single-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-double-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-or-lower-untrimmed":">=1.0,<1.1 || >=1.2","version-range\/lower-and-upper-with-comma-surrounded-by-space-single-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-comma-untrimmed":">=1.0,<2.0","version-range\/lower-and-upper-with-space-double":">=1.0 <2.0","version-range\/lower-and-upper-with-space-double-untrimmed":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single":">=1.0 <2.0","version-range\/lower-and-upper-with-space-single-or-lower":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-or-lower-untrimmed":">=1.0 <1.1 || >=1.2","version-range\/lower-and-upper-with-space-single-untrimmed":">=1.0 <2.0","version-range\/lower-untrimmed":">=1.0","version-range\/tilde-major":"~1","version-range\/tilde-major-minor":"~1.2","version-range\/tilde-major-minor-patch":"~1.2.3","version-range\/tilde-major-minor-patch-untrimmed":"~1.2.3","version-range\/tilde-major-minor-untrimmed":"~1.2","version-range\/tilde-major-untrimmed":"~1","version-range\/upper":"<2.0","version-range\/upper-untrimmed":"<2.0"},"foo":{"qux":"quux","bar":"baz"}}
Loading

0 comments on commit bff2903

Please sign in to comment.