spec/configuration_spec.rb in cliutils-2.2.0 vs spec/configuration_spec.rb in cliutils-2.2.1

@@ -4,34 +4,41 @@
 require 'cliutils/configurator'
 
 describe CLIUtils::Configuration do
   include CLIUtils::Configuration
 
+  let(:config_path_new) { File.expand_path('support/configuration2.yaml') }
+  let(:config_path_existing) { File.expand_path('support/configuration.yaml') }
+  let(:existing_data) { { my_app: {
+                            config_location: '/Users/bob/.my-app-config',
+                            log_level: 'WARN',
+                            version: '1.0.0' },
+                          user_data: {
+                            username: 'bob',
+                            age: 45 } } }
+
   it 'raises an exception if not loaded properly' do
     m = 'Attempted to access `configuration` before executing `load_configuration`'
     expect { configuration }.to raise_error(RuntimeError, m)
   end
 
-  let(:config_path_new) { File.expand_path('support/configuration2.yaml') }
+  it 'returns the same Configurator each time' do
+    load_configuration(config_path_new)
+    c1 = configuration
+    c2 = configuration
+    expect(c1).to eq(c2)
+  end
+
   it 'initializies configuration from scratch' do
     load_configuration(config_path_new)
     expect(configuration.class).to eq(CLIUtils::Configurator)
     expect(configuration.config_path).to eq(config_path_new)
     expect(configuration.data).to eq({})
   end
 
-  let(:config_path_existing) { File.expand_path('support/configuration.yaml') }
-  let(:existing_data) { { my_app: {
-                            config_location: '/Users/bob/.my-app-config',
-                            log_level: 'WARN',
-                            version: '1.0.0' },
-                          user_data: {
-                            username: 'bob',
-                            age: 45 } } }
-
   it 'works with existing configuration data' do
     load_configuration(config_path_existing)
     expect(configuration.class).to eq(CLIUtils::Configurator)
     expect(configuration.config_path).to eq(config_path_existing)
     expect(configuration.data).to eq(existing_data)
   end
-end
\ No newline at end of file
+end