From f2f58655e85c4629276f37b4334c3ddf9f939933 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 21 Jan 2014 12:06:04 -0800 Subject: [PATCH] core: get rid of more references to scope, old terminology --- lib/vagrant/ui.rb | 4 ++-- test/unit/vagrant/ui_test.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/vagrant/ui.rb b/lib/vagrant/ui.rb index b6ff6fb8f..f1230f37e 100644 --- a/lib/vagrant/ui.rb +++ b/lib/vagrant/ui.rb @@ -76,7 +76,7 @@ module Vagrant opts = {} opts = data.pop if data.last.kind_of?(Hash) - target = opts[:scope] || "" + target = opts[:target] || "" # Prepare the data by replacing characters that aren't outputted data.each_index do |i| @@ -225,7 +225,7 @@ module Vagrant def machine(type, *data) opts = {} opts = data.pop if data.last.is_a?(Hash) - opts[:scope] = @prefix + opts[:target] = @prefix data << opts @ui.machine(type, *data) end diff --git a/test/unit/vagrant/ui_test.rb b/test/unit/vagrant/ui_test.rb index 31ba810ce..340cb26ea 100644 --- a/test/unit/vagrant/ui_test.rb +++ b/test/unit/vagrant/ui_test.rb @@ -166,13 +166,13 @@ describe Vagrant::UI::Prefixed do end describe "#machine" do - it "sets the scope option" do - ui.should_receive(:machine).with(:foo, scope: prefix) + it "sets the target option" do + ui.should_receive(:machine).with(:foo, target: prefix) subject.machine(:foo) end it "preserves existing options" do - ui.should_receive(:machine).with(:foo, :bar, foo: :bar, scope: prefix) + ui.should_receive(:machine).with(:foo, :bar, foo: :bar, target: prefix) subject.machine(:foo, :bar, foo: :bar) end end