cf 1.1.4 → 2.0.0

data/spec/cf/cli/start/info_spec.rb

@@ -5,7 +5,9 @@ describe CF::Start::Info do
   let(:all) { false }
 
   let(:client) do
-    fake_client :services => fake_list(:service, 3), :token => CFoundry::AuthToken.new("bearer some-access-token")
+    build(:client).tap do |client|
+      client.stub(:services => Array.new(3) { build(:service) })
+    end
   end
 
   let(:target_info) do

data/spec/cf/cli/start/login_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe CF::Start::Login do
-  let(:client) { fake_client }
+  let(:client) { build(:client) }
 
   describe "metadata" do
     before do

data/spec/cf/cli/start/logout_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module CF
   module Start
     describe Logout do
-      let(:client) { fake_client }
+      let(:client) { build(:client) }
 
       before do
         described_class.any_instance.stub(:client) { client }

data/spec/cf/cli/start/target_spec.rb

@@ -7,8 +7,8 @@ module CF
         stub_client_and_precondition
       end
 
-      let(:client) { fake_client :apps => [app] }
-      let(:app) { fake :app }
+      let(:client) { build(:client).tap {|client| client.stub(:apps => [app]) } }
+      let(:app) { build(:app) }
 
       describe "metadata" do
         let(:command) { Mothership.commands[:target] }
@@ -41,12 +41,13 @@ module CF
         stub_home_dir_with { "#{SPEC_ROOT}/fixtures/fake_home_dirs/new" }
 
         context "when the user is authenticated and has an organization" do
-          let(:user) { fake(:user) }
-          let(:organization) { fake(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => [space]) }
-          let(:space) { fake(:space, :name => "Staging", :guid => "space-id-2", :developers => [user]) }
-          let(:client) { fake_client :organizations => [organization], :token => CFoundry::AuthToken.new("bearer some-access-token") }
+          let(:user) { build(:user) }
+          let(:organization) { build(:organization, :name => "My Org", :guid => "organization-id-1", :users => [user], :spaces => [space]) }
+          let(:space) { build(:space, :name => "Staging", :guid => "space-id-2", :developers => [user]) }
 
           before do
+            client.stub(:logged_in?) { true }
+            client.stub(:organizations) { [organization] }
             client.stub(:current_user) { user }
             client.stub(:organization) { organization }
             client.stub(:current_organization) { organization }

data/spec/cf/cli/user/create_spec.rb

@@ -25,9 +25,9 @@ module CF
       end
 
       describe "running the command" do
-        let(:client) { fake_client }
-        let(:org) { fake(:organization) }
-        let(:user) { fake(:user) }
+        let(:client) { build(:client) }
+        let(:org) { build(:organization) }
+        let(:user) { build(:user) }
 
         before do
           stub_client
@@ -90,7 +90,6 @@ module CF
               user.managed_organizations.should == [org]
               user.audited_organizations.should == [org]
             end
-
           end
         end
       end

data/spec/cf/cli/user/passwd_spec.rb

@@ -16,15 +16,13 @@ module CF
       end
 
       describe "#passwd" do
-        let(:client) { fake_client }
+        let(:client) { build(:client) }
         let(:old_password) { "old" }
         let(:new_password) { "password" }
         let(:verify_password) { new_password }
         let(:score) { :strong }
         let(:guid) { random_string("my-object-guid") }
-        let(:user_model) { fake_model { attribute :password, :object } }
-        let(:user_object) { user_model.new(guid, client) }
-        let(:user) { user_object.fake(:password => "foo") }
+        let(:user) { build(:user) }
 
         before do
           stub_client_and_precondition

data/spec/cf/cli/user/register_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 module CF
   module User
     describe Register do
-      let(:client) { fake_client }
+      let(:client) { build(:client) }
 
       before do
         stub_client_and_precondition
@@ -133,9 +133,9 @@ module CF
           subject { cf %W[register --no-force --no-login] }
 
           it "asks for the email, password and confirm password" do
-            mock_ask("Email") { email }
-            mock_ask("Password", anything) { password }
-            mock_ask("Confirm Password", anything) { verify_password }
+            should_ask("Email") { email }
+            should_ask("Password", anything) { password }
+            should_ask("Confirm Password", anything) { verify_password }
             subject
           end
         end

data/spec/cf/cli_spec.rb

@@ -152,7 +152,7 @@ module CF
 
     describe "#execute" do
       let(:inputs) { {} }
-      let(:client) { fake_client }
+      let(:client) { build(:client) }
 
       before do
         stub_client
@@ -179,8 +179,6 @@ module CF
           def precondition;
           end
 
-          desc "XXX"
-
           def refresh_token
             if client
               client.token = self.class.new_token

data/spec/factories/cfoundry/v2/apps_factory.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :app, :class => CFoundry::V2::App do
+    sequence(:guid) { |n| "app-guid-#{n}" }
+    sequence(:name) { |n| "app-name-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/clients_factory.rb

@@ -0,0 +1,4 @@
+FactoryGirl.define do
+  factory :client, :class => CFoundry::V2::Client do
+  end
+end

data/spec/factories/cfoundry/v2/organizations_factory.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :organization, :class => CFoundry::V2::Organization do
+    sequence(:guid) { |n| "organization-guid-#{n}" }
+    sequence(:name) { |n| "organization-name-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/service_bindings_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :service_binding, :class => CFoundry::V2::ServiceBinding do
+    sequence(:guid) { |n| "service-binding-guid-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/service_instances_factory.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :service_instance, :class => CFoundry::V2::ServiceInstance do
+    sequence(:guid) { |n| "service-instance-guid-#{n}" }
+    sequence(:name) { |n| "service-instance-name-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/service_plans_factory.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :service_plan, :class => CFoundry::V2::ServicePlan do
+    sequence(:guid) { |n| "service-plan-guid-#{n}" }
+    sequence(:name) { |n| "service-plan-name-#{n}" }
+    extra { "{}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/services_factory.rb

@@ -0,0 +1,14 @@
+FactoryGirl.define do
+  factory :service, :class => CFoundry::V2::Service do
+    sequence(:guid) { |n| "service-guid-#{n}" }
+    sequence(:label) { |n| "service-label-#{n}" }
+    service_plans { [build(:service_plan)] }
+    extra { "{}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/spaces_factory.rb

@@ -0,0 +1,12 @@
+FactoryGirl.define do
+  factory :space, :class => CFoundry::V2::Space do
+    sequence(:guid) { |n| "space-guid-#{n}" }
+    sequence(:name) { |n| "space-name-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/factories/cfoundry/v2/stacks_factory.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  factory :stack, :class => CFoundry::V2::Stack do
+    sequence(:guid) { |n| "stack-guid-#{n}" }
+
+    ignore do
+      client { FactoryGirl.build(:client) }
+    end
+
+    initialize_with { new(guid, client) }
+  end
+end

data/spec/features/push_flow_spec.rb

@@ -12,7 +12,7 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
     let(:run_id) { TRAVIS_BUILD_ID.to_s + Time.new.to_f.to_s.gsub(".", "_") }
     let(:app) { "hello-sinatra-#{run_id}" }
-    let(:service_name) { "rds-mysql-#{run_id}" }
+    let(:service_name) { "dummy-service-#{run_id}" }
 
     before do
       FileUtils.rm_rf File.expand_path(CF::CONFIG_DIR)
@@ -65,13 +65,13 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
           # create a service here
           expect(runner).to say "What kind?>"
-          runner.send_keys "rds-mysql"
+          runner.send_keys "dummy n/a"
 
           expect(runner).to say "Name?>"
           runner.send_keys service_name
 
           expect(runner).to say "Which plan?>"
-          runner.send_keys "10mb"
+          runner.send_keys "small"
 
           expect(runner).to say /Creating service #{service_name}.*OK/
           expect(runner).to say /Binding .+ to .+ OK/
@@ -97,17 +97,17 @@ if ENV['CF_V2_RUN_INTEGRATION']
 
       BlueShell::Runner.run("#{cf_bin} services") do |runner|
         expect(runner).to say /name\s+service\s+provider\s+version\s+plan\s+bound apps/
-        expect(runner).to say /rds-mysql-.+?\s+ # name
-            rds-mysql\s+                        # service
-            aws\s+                              # provider
+        expect(runner).to say /dummy-service-.+?\s+ # name
+            dummy\s+                        # service
+            dummy\s+                              # provider
             n\/a\s+                             # version
-            10mb\s+                             # plan
+            small\s+                             # plan
             #{app}                              # bound apps
           /x
       end
 
       BlueShell::Runner.run("#{cf_bin} unbind-service #{service_name} #{app}") do |runner|
-        runner.wait_for_exit(20)
+        expect(runner).to say "OK", 20
       end
 
       BlueShell::Runner.run("#{cf_bin} delete #{app}") do |runner|

data/spec/manifests/manifests_spec.rb

@@ -15,14 +15,14 @@ describe CFManifests do
 
   let(:target_base) { "some-cloud.com" }
 
-  let(:foo) { fake(:app, :name => "foo") }
-  let(:bar) { fake(:app, :name => "bar") }
-  let(:baz) { fake(:app, :name => "baz") }
-  let(:xxx) { fake(:app, :name => "xxx") }
-  let(:yyy) { fake(:app, :name => "yyy") }
+  let(:foo) { build(:app, :name => "foo") }
+  let(:bar) { build(:app, :name => "bar") }
+  let(:baz) { build(:app, :name => "baz") }
+  let(:xxx) { build(:app, :name => "xxx") }
+  let(:yyy) { build(:app, :name => "yyy") }
 
   let(:client) do
-    fake_client :apps => [foo, bar, baz, xxx, yyy]
+    build(:client).tap { |client| client.stub(:apps => [foo, bar, baz, xxx, yyy]) }
   end
 
   let(:manifest_file) { "/abc/manifest.yml" }
@@ -44,31 +44,31 @@ describe CFManifests do
   end
 
   describe "#create_manifest_for" do
-    let(:app) {
-      fake :app,
+    let(:app) do
+      build :app,
         :memory => 2048,
         :total_instances => 2,
         :command => "ruby main.rb",
         :buildpack => "git://example.com/foo.git",
         :routes => [
-          fake(:route,
-               :host => "some-app-name",
-               :domain => fake(:domain, :name => target_base))
+          build(:route,
+            :host => "some-app-name",
+            :domain => build(:domain, :name => target_base))
         ],
         :service_bindings => [
-          fake(
+          build(
             :service_binding,
             :service_instance =>
-              fake(
+              build(
                 :service_instance,
                 :name => "service-1",
                 :service_plan =>
-                  fake(
+                  build(
                     :service_plan,
                     :name => "P200",
-                    :service => fake(:service))))
+                    :service => build(:service))))
         ]
-    }
+    end
 
     subject { cmd.create_manifest_for(app, "some-path") }
 
@@ -105,73 +105,56 @@ describe CFManifests do
       end
     end
 
-    context "when there is no url" do
+    context "with only minimum configuration" do
       let(:app) {
-        fake :app,
+        build :app,
           :memory => 2048,
-          :total_instances => 2
+          :total_instances => 2,
+          :routes => [],
+          :service_bindings => []
       }
 
       its(["url"]) { should eq "none" }
-    end
-
-    context "when there is no command" do
-      let(:app) {
-        fake :app,
-          :memory => 2048,
-          :total_instances => 2
-      }
-
       it { should_not include "command" }
-    end
-
-    context "when there are no service bindings" do
-      let(:app) {
-        fake :app,
-          :memory => 2048,
-          :total_instances => 2
-      }
-
       it { should_not include "services" }
     end
   end
 
   describe "#setup_services" do
     let(:service_bindings) { [] }
-    let(:app) { fake :app, :service_bindings => service_bindings }
+    let(:app) { build :app, :service_bindings => service_bindings }
 
     before do
       dont_allow_ask(anything, anything)
     end
 
     context "when services are defined in the manifest" do
-      let(:info) {
-        { :services => { "service-1" => { :label => "mysql", :plan => "100" } } }
-      }
-
-      let(:service_1) { fake(:service_instance, :name => "service-1") }
+      let(:info) do
+        {:services => {"service-1" => {:label => "mysql", :plan => "100"}}}
+      end
 
-      let(:plan_100) { fake :service_plan, :name => "100" }
+      let(:service_1) { build(:service_instance, :name => "service-1") }
+      let(:plan_100) { build :service_plan, :name => "100" }
 
-      let(:mysql) {
-        fake(
+      let(:mysql) do
+        build(
           :service,
           :label => "mysql",
           :provider => "core",
           :service_plans => [plan_100])
-      }
+      end
 
       let(:service_instances) { [] }
 
-      let(:client) {
-        fake_client :services => [mysql], :service_instances => service_instances
-      }
+      let(:client) do
+        build(:client).tap { |client| client.stub(:services => [mysql], :service_instances => service_instances) }
+      end
 
       context "and the services exist" do
         let(:service_instances) { [service_1] }
 
         context "and are already bound" do
-          let(:service_bindings) { [fake(:service_binding, :service_instance => service_1)] }
+          let(:service_bindings) { [build(:service_binding, :service_instance => service_1)] }
 
           it "does neither create nor bind the service again" do
             cmd.should_not_receive(:invoke).with(:create_service, anything)