Fix a regression with aliases on `Mash.load`

Also, reorganize the test into the existing file and update the
changelog.

2 files changed, 8 insertions, 8 deletions

diff --git a/spec/hashie/mash_is_loading_yaml_spec.rb b/spec/hashie/mash_is_loading_yaml_spec.rb
deleted file mode 100644
index f7edea4..0000000
--- a/spec/hashie/mash_is_loading_yaml_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require "spec_helper"
-
-context "load yaml" do
-  it do
-    mash = Hashie::Mash.load("spec/fixtures/yaml_with_aliases.yml")
-    expect(mash.company_a.accounts.admin.password).to eq "secret"
-  end
-end
diff --git a/spec/hashie/mash_spec.rb b/spec/hashie/mash_spec.rb
index 680f403..b46bd6c 100644
--- a/spec/hashie/mash_spec.rb
+++ b/spec/hashie/mash_spec.rb
@@ -694,6 +694,14 @@ describe Hashie::Mash do
         expect(subject.object_id).to eq subject.object_id
       end
     end
+
+    context 'when the file has aliases in it' do
+      it 'can use the aliases and does not raise an error' do
+        mash = Hashie::Mash.load('spec/fixtures/yaml_with_aliases.yml')
+
+        expect(mash.company_a.accounts.admin.password).to eq('secret')
+      end
+    end
   end
 
   describe '#to_module(mash_method_name)' do