From bf5f2039e5f3d3fc715da6bcb503b1d6ab7fe0b2 Mon Sep 17 00:00:00 2001
From: Farah Schueller <fschueller@suse.de>
Date: Thu, 6 Apr 2017 16:31:01 +0200
Subject: [PATCH] Clean up specs

---
 spec/connect/client_spec.rb | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/spec/connect/client_spec.rb b/spec/connect/client_spec.rb
index 71736a42..2a884408 100644
--- a/spec/connect/client_spec.rb
+++ b/spec/connect/client_spec.rb
@@ -404,36 +404,41 @@
       )
     end
 
+    before { SUSE::Connect::GlobalLogger.instance.log = string_logger }
+
     context 'when system is registered' do
       before do
         allow(subject).to receive_messages(system_auth: 'Basic: encodedstring')
         allow(subject).to receive(:registered?).and_return true
+        allow(subject.api).to receive(:deregister).with('Basic: encodedstring').and_return stubbed_response
       end
 
       it 'calls underlying api and removes credentials file' do
         expect(subject.api).to receive(:deregister).with('Basic: encodedstring').and_return stubbed_response
-        expect(System).to receive(:cleanup!).and_return(true)
+        subject.deregister!
+      end
 
+      it 'cleans up system' do
+        expect(System).to receive(:cleanup!).and_return(true)
         subject.deregister!
       end
 
-      it 'prints confirmation message on successful deregistration' do
-        allow(subject.api).to receive(:deregister).with('Basic: encodedstring').and_return stubbed_response
-        allow(System).to receive(:cleanup!).and_return(true)
-        SUSE::Connect::GlobalLogger.instance.log = string_logger
-        expect(string_logger).to receive(:info).with('Successfully deregistered system.')
+      context 'when system is cleaned up' do
+        before do
+          allow(System).to receive(:cleanup!).and_return(true)
+        end
 
-        subject.deregister!
+        it 'prints confirmation message' do
+          expect(string_logger).to receive(:info).with('Successfully deregistered system.')
+          subject.deregister!
+        end
       end
     end
 
     context 'when system is not registered' do
-      before do
-        allow(subject).to receive(:registered?).and_return false
-      end
+      before { allow(subject).to receive(:registered?).and_return false }
 
-      it 'prints warning when system was not registered before' do
-        SUSE::Connect::GlobalLogger.instance.log = string_logger
+      it 'prints a warning' do
         expect(string_logger).to receive(:fatal).with('Deregistration failed. Check if the system has been '\
             'registered using the -s option or use the --regcode parameter to register it.')
         subject.deregister!