From f4b6c28e8a453719e784be82cd3147e486e7bb2c Mon Sep 17 00:00:00 2001
From: Tianon Gravi <admwiggin@gmail.com>
Date: Tue, 16 Jun 2015 15:00:07 -0700
Subject: [PATCH] Remove Gemfile.lock (it is far too volatile for VCS now)

---
 test/tests/ruby-bundler/Gemfile.lock | 33 ----------------------------
 test/tests/ruby-bundler/container.sh | 10 +++++++++
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 test/tests/ruby-bundler/Gemfile.lock

diff --git a/test/tests/ruby-bundler/Gemfile.lock b/test/tests/ruby-bundler/Gemfile.lock
deleted file mode 100644
index 4be58e05a..000000000
--- a/test/tests/ruby-bundler/Gemfile.lock
+++ /dev/null
@@ -1,33 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    mini_portile (0.6.2)
-    nokogiri (1.6.5)
-      mini_portile (~> 0.6.0)
-    nokogiri (1.6.5-java)
-    rack (1.6.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  nokogiri
-  rack (~> 1.1)
-  rspec
-
-BUNDLED WITH
-   1.10.3
diff --git a/test/tests/ruby-bundler/container.sh b/test/tests/ruby-bundler/container.sh
index 8dcfaa4df..7624e4244 100644
--- a/test/tests/ruby-bundler/container.sh
+++ b/test/tests/ruby-bundler/container.sh
@@ -1,4 +1,14 @@
 #!/bin/bash
 set -e
 
+dir="$(mktemp -d)"
+trap "rm -rf '$dir'" EXIT
+
+cp Gemfile "$dir"
+
+# make sure that running "bundle" twice doesn't change Gemfile.lock the second time
+cd "$dir"
 bundle
+cp Gemfile.lock{,.orig}
+bundle
+diff -u Gemfile.lock{.orig,} >&2