Merge pull request #85 from bzwei/job_events

Add job_events to job class and remove job_plays

lib/ansible_tower_client.rb

@@ -21,7 +21,6 @@
 require "ansible_tower_client/base_models/inventory_update"
 require "ansible_tower_client/base_models/job"
 require "ansible_tower_client/base_models/job_event"
-require "ansible_tower_client/base_models/job_play"
 require "ansible_tower_client/base_models/job_template"
 require "ansible_tower_client/base_models/organization"
 require "ansible_tower_client/base_models/project"

lib/ansible_tower_client/base_models/job.rb

@@ -4,8 +4,8 @@ def extra_vars_hash
       extra_vars.empty? ? {} : hashify(:extra_vars)
     end
 
-    def job_plays
-      Collection.new(api, api.job_play_class).find_all_by_url(related["job_plays"])
+    def job_events(options = nil)
+      Collection.new(api, api.job_event_class).find_all_by_url(related["job_events"], options)
     end
 
     def stdout(format = 'txt')

spec/factories/responses.rb

@@ -45,7 +45,6 @@
     trait(:job)          { [description, extra_vars] }
     trait(:project)      { [description, organization] }
     trait(:job_event)    { [url] }
-    trait(:job_play)     { [url] }
 
     initialize_with { AnsibleTowerClient::FactoryHelper.stringify_attribute_keys(attributes) }
   end

spec/job_spec.rb

@@ -37,17 +37,17 @@
     end
   end
 
-  context '#job_plays' do
-    let(:url)            { "example.com/api/v1/job_plays" }
+  context '#job_events' do
+    let(:url)            { "example.com/api/v1/job_events" }
     let(:job_collection) { build(:response_collection, :klass => described_class) }
-    let(:job_plays)      { build(:response_url_collection, :klass => AnsibleTowerClient::JobPlay, :url => url) }
-    it "returns a collection of AnsibleTowerClient::JobPlays" do
-      expect(AnsibleTowerClient::Collection).to receive(:new).with(api, api.job_play_class).and_return(job_collection)
-      expect(job_collection).to receive(:find_all_by_url).and_return(job_plays['results'])
-      results = described_class.new(api, raw_instance).job_plays.first
+    let(:job_events)     { build(:response_url_collection, :klass => AnsibleTowerClient::JobEvent, :url => url) }
+    it "returns a collection of AnsibleTowerClient::JobEvents" do
+      expect(AnsibleTowerClient::Collection).to receive(:new).with(api, api.job_event_class).and_return(job_collection)
+      expect(job_collection).to receive(:find_all_by_url).and_return(job_events['results'])
+      results = described_class.new(api, raw_instance).job_events.first
       expect(results).to include(
-        "type" => "job_play",
-        "url"  => "example.com/api/v1/job_plays",
+        "type" => "job_event",
+        "url"  => "example.com/api/v1/job_events",
       )
     end
   end