From 2e3e46fe63c6051f2164be9f82c26359096fd7c2 Mon Sep 17 00:00:00 2001
From: Philip Harrison <philip@mailharrison.com>
Date: Fri, 17 Jul 2020 10:32:28 +0100
Subject: [PATCH] Fix flaky npm preserved indentation spec

---
 .../npm_and_yarn/file_updater_spec.rb         |  4 +-
 .../package_lock_preserved_indentation.json   | 83 -------------------
 ...ock_preserved_indentation_partial_lockfile |  6 ++
 3 files changed, 8 insertions(+), 85 deletions(-)
 delete mode 100644 npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation.json
 create mode 100644 npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation_partial_lockfile

diff --git a/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb b/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb
index e99edcb462ed..64ba198c8810 100644
--- a/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb
+++ b/npm_and_yarn/spec/dependabot/npm_and_yarn/file_updater_spec.rb
@@ -2504,8 +2504,8 @@
 
       context "with non-standard indentation" do
         it "preserves indentation in the package-lock.json" do
-          expect(updated_npm_lock.content).to eq(
-            fixture("npm_lockfiles", "package_lock_preserved_indentation.json")
+          expect(updated_npm_lock.content).to start_with(
+            fixture("npm_lockfiles", "package_lock_preserved_indentation_partial_lockfile")
           )
         end
       end
diff --git a/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation.json b/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation.json
deleted file mode 100644
index 2f6ebab3fd1d..000000000000
--- a/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-	"name": "{{ name }}",
-	"version": "1.0.0",
-	"lockfileVersion": 1,
-	"requires": true,
-	"dependencies": {
-		"encoding": {
-			"version": "0.1.12",
-			"resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
-			"integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
-			"requires": {
-				"iconv-lite": "~0.4.13"
-			}
-		},
-		"es6-promise": {
-			"version": "3.3.1",
-			"resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
-			"integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
-		},
-		"etag": {
-			"version": "1.8.1",
-			"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-			"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
-			"dev": true
-		},
-		"fetch-factory": {
-			"version": "0.0.2",
-			"resolved": "https://registry.npmjs.org/fetch-factory/-/fetch-factory-0.0.2.tgz",
-			"integrity": "sha1-7h380QJIZAv+MOXD2Jiie3Ysh6w=",
-			"requires": {
-				"es6-promise": "^3.0.2",
-				"isomorphic-fetch": "^2.1.1",
-				"lodash": "^3.10.1"
-			}
-		},
-		"iconv-lite": {
-			"version": "0.4.24",
-			"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-			"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-			"requires": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			}
-		},
-		"is-stream": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-			"integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
-		},
-		"isomorphic-fetch": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
-			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
-			"requires": {
-				"node-fetch": "^1.0.1",
-				"whatwg-fetch": ">=0.10.0"
-			}
-		},
-		"lodash": {
-			"version": "3.10.1",
-			"resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
-			"integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
-		},
-		"node-fetch": {
-			"version": "1.7.3",
-			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
-			"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
-			"requires": {
-				"encoding": "^0.1.11",
-				"is-stream": "^1.0.1"
-			}
-		},
-		"safer-buffer": {
-			"version": "2.1.2",
-			"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-			"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-		},
-		"whatwg-fetch": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.2.0.tgz",
-			"integrity": "sha512-SdGPoQMMnzVYThUbSrEvqTlkvC1Ux27NehaJ/GUHBfNrh5Mjg+1/uRyFMwVnxO2MrikMWvWAqUGgQOfVU4hT7w=="
-		}
-	}
-}
diff --git a/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation_partial_lockfile b/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation_partial_lockfile
new file mode 100644
index 000000000000..64a942cca351
--- /dev/null
+++ b/npm_and_yarn/spec/fixtures/npm_lockfiles/package_lock_preserved_indentation_partial_lockfile
@@ -0,0 +1,6 @@
+{
+	"name": "{{ name }}",
+	"version": "1.0.0",
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {