From 02d0d424be04cb05ce56b7d21cc843345b0d9a2c Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Fri, 16 Aug 2019 14:52:03 +0900
Subject: Revert "[bundler/bundler] Fixup #7297"

This reverts commit b8d759806ff825e1b9344ba34b1a2bc4809d0988.

  It's accidentally picked from the upstream repository.
---
 spec/bundler/build_metadata_spec.rb         | 44 -----------------------------
 spec/bundler/bundler/build_metadata_spec.rb | 44 +++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 44 deletions(-)
 delete mode 100644 spec/bundler/build_metadata_spec.rb
 create mode 100644 spec/bundler/bundler/build_metadata_spec.rb

(limited to 'spec')

diff --git a/spec/bundler/build_metadata_spec.rb b/spec/bundler/build_metadata_spec.rb
deleted file mode 100644
index a28e25511a..0000000000
--- a/spec/bundler/build_metadata_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "bundler"
-require "bundler/build_metadata"
-
-RSpec.describe Bundler::BuildMetadata do
-  describe "#built_at" do
-    it "returns %Y-%m-%d formatted time" do
-      expect(Bundler::BuildMetadata.built_at).to eq Time.now.strftime("%Y-%m-%d")
-    end
-  end
-
-  describe "#release?" do
-    it "returns false as default" do
-      expect(Bundler::BuildMetadata.release?).to be_falsey
-    end
-  end
-
-  describe "#git_commit_sha" do
-    context "if instance valuable is defined" do
-      before do
-        Bundler::BuildMetadata.instance_variable_set(:@git_commit_sha, "foo")
-      end
-
-      after do
-        Bundler::BuildMetadata.remove_instance_variable(:@git_commit_sha)
-      end
-
-      it "returns set value" do
-        expect(Bundler::BuildMetadata.git_commit_sha).to eq "foo"
-      end
-    end
-  end
-
-  describe "#to_h" do
-    subject { Bundler::BuildMetadata.to_h }
-
-    it "returns a hash includes Built At, Git SHA and Released Version" do
-      expect(subject["Built At"]).to eq Time.now.strftime("%Y-%m-%d")
-      expect(subject["Git SHA"]).to be_instance_of(String)
-      expect(subject["Released Version"]).to be_falsey
-    end
-  end
-end
diff --git a/spec/bundler/bundler/build_metadata_spec.rb b/spec/bundler/bundler/build_metadata_spec.rb
new file mode 100644
index 0000000000..a28e25511a
--- /dev/null
+++ b/spec/bundler/bundler/build_metadata_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "bundler"
+require "bundler/build_metadata"
+
+RSpec.describe Bundler::BuildMetadata do
+  describe "#built_at" do
+    it "returns %Y-%m-%d formatted time" do
+      expect(Bundler::BuildMetadata.built_at).to eq Time.now.strftime("%Y-%m-%d")
+    end
+  end
+
+  describe "#release?" do
+    it "returns false as default" do
+      expect(Bundler::BuildMetadata.release?).to be_falsey
+    end
+  end
+
+  describe "#git_commit_sha" do
+    context "if instance valuable is defined" do
+      before do
+        Bundler::BuildMetadata.instance_variable_set(:@git_commit_sha, "foo")
+      end
+
+      after do
+        Bundler::BuildMetadata.remove_instance_variable(:@git_commit_sha)
+      end
+
+      it "returns set value" do
+        expect(Bundler::BuildMetadata.git_commit_sha).to eq "foo"
+      end
+    end
+  end
+
+  describe "#to_h" do
+    subject { Bundler::BuildMetadata.to_h }
+
+    it "returns a hash includes Built At, Git SHA and Released Version" do
+      expect(subject["Built At"]).to eq Time.now.strftime("%Y-%m-%d")
+      expect(subject["Git SHA"]).to be_instance_of(String)
+      expect(subject["Released Version"]).to be_falsey
+    end
+  end
+end
-- 
cgit v1.2.3