From 49fe77ddb10bf96d0cd341645aa8ffd8bbb23b70 Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Wed, 8 Apr 2015 17:36:11 +0000 Subject: [PATCH] Integrate our new Runner into CLI --- lib/uh/wm/cli.rb | 4 +--- spec/uh/wm/cli_spec.rb | 13 ++----------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/uh/wm/cli.rb b/lib/uh/wm/cli.rb index 5ea3e54..bf478db 100644 --- a/lib/uh/wm/cli.rb +++ b/lib/uh/wm/cli.rb @@ -32,9 +32,7 @@ module Uh end def run - @display = Display.new - @display.open - @env.log "Connected to X server on `#{@display}'" + Runner.run env end diff --git a/spec/uh/wm/cli_spec.rb b/spec/uh/wm/cli_spec.rb index 5b6b5de..193ed83 100644 --- a/spec/uh/wm/cli_spec.rb +++ b/spec/uh/wm/cli_spec.rb @@ -63,19 +63,10 @@ module Uh end describe '#run' do - let(:display) { instance_spy Display } - - before { allow(Display).to receive(:new) { display } } - - it 'opens a new X display' do - expect(display).to receive :open + it 'runs a runner with the env' do + expect(Runner).to receive(:run).with(cli.env) cli.run end - - it 'prints a message on standard output when connected' do - cli.run - expect(stdout.string).to match /connected/i - end end describe '#parse_arguments!' do