flapjack-diner 2.0.0b1 → 2.0.0.pre.alpha.1

data/lib/flapjack-diner/version.rb

@@ -1,5 +1,5 @@
 module Flapjack
   module Diner
-    VERSION = '2.0.0b1'
+    VERSION = '2.0.0-alpha.1'
   end
 end

data/spec/flapjack-diner_spec.rb

@@ -3,6 +3,8 @@ require 'flapjack-diner'
 
 describe Flapjack::Diner do
 
+  # include_context 'fixture data'
+
   let(:server) { 'flapjack.com' }
 
   let(:time) { Time.now }
@@ -16,9 +18,9 @@ describe Flapjack::Diner do
     WebMock.reset!
   end
 
-  # context 'argument parsing' do
+  context 'argument parsing' do
 
-  # end
+  end
 
   context 'keys as strings' do
 
@@ -39,8 +41,8 @@ describe Flapjack::Diner do
       expect(result).not_to be_nil
       expect(result).to be_an_instance_of(Array)
       expect(result.length).to be(1)
-      expect(result.first).to be_an_instance_of(Hash)
-      expect(result.first).to have_key('id')
+      expect(result[0]).to be_an_instance_of(Hash)
+      expect(result[0]).to have_key('id')
     end
 
   end
@@ -58,7 +60,9 @@ describe Flapjack::Diner do
       req = stub_request(:get, "http://#{server}/contacts").
         to_return(:body => response)
 
-      expect(logger).to receive(:info).with(%r{\[Flapjack::Diner\] \[[^\]]+\] 200 "GET /contacts" - $})
+      expect(logger).to receive(:info).with("GET http://#{server}/contacts")
+      expect(logger).to receive(:info).with("  Response Code: 200")
+      expect(logger).to receive(:info).with("  Response Body: #{response}")
 
       result = Flapjack::Diner.contacts
       expect(req).to have_been_requested
@@ -78,8 +82,10 @@ describe Flapjack::Diner do
       response = {:data => resp_data}.to_json
       req = stub_request(:post, "http://#{server}/test_notifications").
               to_return(:status => 201, :body => response)
-
-      expect(logger).to receive(:info).with(%r{\[Flapjack::Diner\] \[[^\]]+\] 201 "POST /test_notifications" - $})
+      expect(logger).to receive(:info).with("POST http://#{server}/test_notifications\n" +
+        "  Body: {:data=>#{req_data.inspect}}")
+      expect(logger).to receive(:info).with("  Response Code: 201")
+      expect(logger).to receive(:info).with("  Response Body: #{response}")
 
       result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:check => check_data[:id]))
       expect(req).to have_been_requested
@@ -90,8 +96,8 @@ describe Flapjack::Diner do
       req = stub_request(:delete, "http://#{server}/scheduled_maintenances/#{scheduled_maintenance_data[:id]}").
         to_return(:status => 204)
 
-      expect(logger).to receive(:info).
-        with(%r{\[Flapjack::Diner\] \[[^\]]+\] 204 "DELETE /scheduled_maintenances/#{scheduled_maintenance_data[:id]}" - $})
+      expect(logger).to receive(:info).with("DELETE http://#{server}/scheduled_maintenances/#{scheduled_maintenance_data[:id]}")
+      expect(logger).to receive(:info).with("  Response Code: 204")
 
       result = Flapjack::Diner.delete_scheduled_maintenances(scheduled_maintenance_data[:id])
       expect(req).to have_been_requested
@@ -101,6 +107,7 @@ describe Flapjack::Diner do
   end
 
   context "problems" do
+
     it "raises an exception on network failure" do
       req = stub_request(:get, "http://#{server}/contacts").to_timeout
 
@@ -138,5 +145,7 @@ describe Flapjack::Diner do
       }.to raise_error(ArgumentError)
       expect(req).not_to have_been_requested
     end
+
   end
+
 end

data/spec/resources/checks_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::Checks, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -55,7 +55,7 @@ describe Flapjack::Diner::Resources, :pact => true do
       req_data  = check_json(check_data).merge(
         :relationships => {
           :tags => {
-            :data => [{:type => 'tag', :id => tag_data[:id]}]
+            :data => [{:type => 'tag', :id => tag_data[:name]}]
           }
         }
       )
@@ -71,7 +71,7 @@ describe Flapjack::Diner::Resources, :pact => true do
           :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
           :body => {:data => resp_data})
 
-      result = Flapjack::Diner.create_checks(check_data.merge(:tags => [tag_data[:id]]))
+      result = Flapjack::Diner.create_checks(check_data.merge(:tags => [tag_data[:name]]))
       expect(result).to eq(resultify(resp_data))
     end
 
@@ -218,7 +218,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
         result = Flapjack::Diner.checks(check_data[:id])
         expect(result).to be_nil
-        expect(Flapjack::Diner.error).to eq([{:status => '404',
+        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
           :detail => "could not find Check record, id: '#{check_data[:id]}'"}])
       end
     end
@@ -277,7 +277,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.update_checks(:id => check_data[:id], :enabled => false)
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find Check record, id: '#{check_data[:id]}'"}])
     end
 
@@ -287,7 +287,7 @@ describe Flapjack::Diner::Resources, :pact => true do
         :type => 'check',
         :relationships => {
           :tags => {
-            :data => [{:type => 'tag', :id => tag_data[:id]}]
+            :data => [{:type => 'tag', :id => tag_data[:name]}]
           }
         }
       }
@@ -302,7 +302,7 @@ describe Flapjack::Diner::Resources, :pact => true do
           :status => 204,
           :body => '' )
 
-      result = Flapjack::Diner.update_checks(:id => check_data[:id], :tags => [tag_data[:id]])
+      result = Flapjack::Diner.update_checks(:id => check_data[:id], :tags => [tag_data[:name]])
       expect(result).to be_a(TrueClass)
     end
 

data/spec/resources/contacts_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::Contacts, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -70,7 +70,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.create_contacts(contact_data)
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '409',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '409',
         :detail => "Contacts already exist with the following ids: #{contact_data[:id]}"}])
     end
 
@@ -146,7 +146,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
         result = Flapjack::Diner.contacts(contact_data[:id])
         expect(result).to be_nil
-        expect(Flapjack::Diner.error).to eq([{:status => '404',
+        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
           :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
       end
 
@@ -159,7 +159,7 @@ describe Flapjack::Diner::Resources, :pact => true do
         resp_data[:relationships][:media][:data] = [
           {:type => 'medium', :id => email_data[:id]}
         ]
-        resp_included = [medium_json(email_data)]
+        resp_included = [medium_json(email_data).merge(:relationships => medium_rel(email_data))]
 
         flapjack.given("a contact with one medium exists").
           upon_receiving("a GET request for a single contact with media").
@@ -173,7 +173,7 @@ describe Flapjack::Diner::Resources, :pact => true do
         result = Flapjack::Diner.contacts(contact_data[:id], :include => 'media')
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
-        expect(Flapjack::Diner.context).to eq(:included => {'medium' => {email_data[:id] => resultify(resp_included.first)}})
+        expect(Flapjack::Diner.context).to eq(:included => resultify(resp_included))
       end
 
       it 'returns a contact with media and rules' do
@@ -185,8 +185,8 @@ describe Flapjack::Diner::Resources, :pact => true do
           {:type => 'rule', :id => rule_data[:id]}
         ]
         resp_included = [
-          medium_json(email_data),
-          rule_json(rule_data)
+          medium_json(email_data).merge(:relationships => medium_rel(email_data)),
+          rule_json(rule_data).merge(:relationships => rule_rel(rule_data))
         ]
 
         flapjack.given("a contact with one medium and one rule exists").
@@ -201,13 +201,11 @@ describe Flapjack::Diner::Resources, :pact => true do
         result = Flapjack::Diner.contacts(contact_data[:id], :include => ['media', 'rules'])
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
-        expect(Flapjack::Diner.context).to eq(:included => {
-          'medium' => {email_data[:id] => resultify(resp_included[0])},
-          'rule'  => {rule_data[:id] => resultify(resp_included[1])}
-        })
-
+        expect(Flapjack::Diner.context).to eq(:included => [resultify(resp_included[0]), resultify(resp_included[1])])
       end
+
     end
+
   end
 
   context 'update' do
@@ -263,7 +261,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.update_contacts(:id => contact_data[:id], :name => 'Hello There')
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
     end
   end
@@ -317,7 +315,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.delete_contacts(contact_data[:id])
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find Contact record, id: '#{contact_data[:id]}'"}])
     end
   end

data/spec/resources/events_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::Events, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -41,7 +41,7 @@ describe Flapjack::Diner::Resources, :pact => true do
         req_data  = test_notification_json(test_notification_data).merge(
           :relationships => {
             :tag => {
-              :data => {:type => 'tag', :id => tag_data[:id]}
+              :data => {:type => 'tag', :id => tag_data[:name]}
             }
           }
         )
@@ -57,7 +57,7 @@ describe Flapjack::Diner::Resources, :pact => true do
             :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
             :body => {:data => resp_data})
 
-        result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:tag => tag_data[:id]))
+        result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:tag => tag_data[:name]))
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
       end
@@ -107,14 +107,14 @@ describe Flapjack::Diner::Resources, :pact => true do
           test_notification_json(test_notification_data).merge(
             :relationships => {
               :tag => {
-                :data => {:type => 'tag', :id => tag_data[:id]}
+                :data => {:type => 'tag', :id => tag_data[:name]}
               }
             }
           ),
           test_notification_json(test_notification_2_data).merge(
             :relationships => {
               :tag => {
-                :data => {:type => 'tag', :id => tag_data[:id]}
+                :data => {:type => 'tag', :id => tag_data[:name]}
               }
             }
           )
@@ -136,8 +136,8 @@ describe Flapjack::Diner::Resources, :pact => true do
             :body => {:data => resp_data})
 
         result = Flapjack::Diner.create_test_notifications(
-          test_notification_data.merge(:tag => tag_data[:id]),
-          test_notification_2_data.merge(:tag => tag_data[:id])
+          test_notification_data.merge(:tag => tag_data[:name]),
+          test_notification_2_data.merge(:tag => tag_data[:name])
         )
         expect(result).not_to be_nil
         expect(result).to eq(resultify(resp_data))
@@ -168,7 +168,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
         result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:check => check_data[:id]))
         expect(result).to be_nil
-        expect(Flapjack::Diner.error).to eq([{:status => '404',
+        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
           :detail => "could not find Check record, id: '#{check_data[:id]}'"}])
       end
 
@@ -176,7 +176,7 @@ describe Flapjack::Diner::Resources, :pact => true do
         req_data  = test_notification_json(test_notification_data).merge(
           :relationships => {
             :tag => {
-              :data => {:type => 'tag', :id => tag_data[:id]}
+              :data => {:type => 'tag', :id => tag_data[:name]}
             }
           }
         )
@@ -191,14 +191,14 @@ describe Flapjack::Diner::Resources, :pact => true do
           :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
           :body => {:errors => [{
               :status => '404',
-              :detail => "could not find Tag record, id: '#{tag_data[:id]}'"
+              :detail => "could not find Tag record, id: '#{tag_data[:name]}'"
             }]}
           )
 
-        result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:tag => tag_data[:id]))
+        result = Flapjack::Diner.create_test_notifications(test_notification_data.merge(:tag => tag_data[:name]))
         expect(result).to be_nil
-        expect(Flapjack::Diner.error).to eq([{:status => '404',
-          :detail => "could not find Tag record, id: '#{tag_data[:id]}'"}])
+        expect(Flapjack::Diner.last_error).to eq([{:status => '404',
+          :detail => "could not find Tag record, id: '#{tag_data[:name]}'"}])
       end
 
     end

data/spec/resources/maintenance_periods_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::MaintenancePeriods, :pact => true do
 
   let(:time) { Time.now }
 
@@ -148,7 +148,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.update_unscheduled_maintenances(:id => unscheduled_maintenance_data[:id], :end_time => time)
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find UnscheduledMaintenance record, id: '#{unscheduled_maintenance_data[:id]}'"}])
     end
 
@@ -206,7 +206,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.delete_scheduled_maintenances(scheduled_maintenance_data[:id])
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find ScheduledMaintenance record, id: '#{scheduled_maintenance_data[:id]}'"}])
     end
 

data/spec/resources/media_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::Media, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -198,7 +198,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.update_media(:id => email_data[:id], :interval => 50)
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find Medium record, id: '#{email_data[:id]}'"}])
     end
 
@@ -254,7 +254,7 @@ describe Flapjack::Diner::Resources, :pact => true do
 
       result = Flapjack::Diner.delete_media(sms_data[:id])
       expect(result).to be_nil
-      expect(Flapjack::Diner.error).to eq([{:status => '404',
+      expect(Flapjack::Diner.last_error).to eq([{:status => '404',
         :detail => "could not find Medium record, id: '#{sms_data[:id]}'"}])
     end
 

data/spec/resources/metrics_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Resources, :pact => true do
+describe Flapjack::Diner::Resources::Metrics, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')

data/spec/{relationships_spec.rb → resources/relationships_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'flapjack-diner'
 
-describe Flapjack::Diner::Relationships, :pact => true do
+describe Flapjack::Diner::Resources::Relationships, :pact => true do
 
   before(:each) do
     Flapjack::Diner.base_uri('localhost:19081')
@@ -13,11 +13,11 @@ describe Flapjack::Diner::Relationships, :pact => true do
       upon_receiving("a POST request adding a tag to a check").
       with(:method => :post, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
-    result = Flapjack::Diner.create_check_link_tags(check_data[:id], tag_data[:id])
+    result = Flapjack::Diner.create_check_link_tags(check_data[:id], tag_data[:name])
     expect(result).to be true
   end
 
@@ -26,13 +26,13 @@ describe Flapjack::Diner::Relationships, :pact => true do
       upon_receiving("a POST request adding two tags to a check").
       with(:method => :post, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:id], :type => 'tag'},
-                               {:id => tag_2_data[:id], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:name], :type => 'tag'},
+                               {:id => tag_2_data[:name], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.create_check_link_tags(check_data[:id],
-      tag_data[:id], tag_2_data[:id])
+      tag_data[:name], tag_2_data[:name])
     expect(result).to be true
   end
 
@@ -43,15 +43,15 @@ describe Flapjack::Diner::Relationships, :pact => true do
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]})
+        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]})
 
     result = Flapjack::Diner.check_link_tags(check_data[:id])
-    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
+    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
   end
 
   it 'gets tags for a check with full tag records' do
     included_data = [
-      tag_json(tag_data)
+      tag_json(tag_data).merge(:relationships => tag_rel(tag_data))
     ]
 
     flapjack.given("a check with a tag exists").
@@ -62,18 +62,18 @@ describe Flapjack::Diner::Relationships, :pact => true do
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}],
+        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}],
                   :included => included_data})
 
     result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'tags')
-    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
-    expect(Flapjack::Diner.context[:included]).to eq('tag' => {tag_data[:id] => resultify(included_data[0])})
+    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
+    expect(Flapjack::Diner.context[:included]).to eq([resultify(included_data[0])])
   end
 
   it 'gets tags for a check with full tag and rule record' do
     included_data = [
-      tag_json(tag_data),
-      rule_json(rule_data)
+      tag_json(tag_data).merge(:relationships => tag_rel(tag_data)),
+      rule_json(rule_data).merge(:relationships => rule_rel(rule_data))
     ]
 
     flapjack.given("a check with a tag and a rule exists").
@@ -84,15 +84,13 @@ describe Flapjack::Diner::Relationships, :pact => true do
       will_respond_with(
         :status => 200,
         :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {:data => [{:id => tag_data[:id], :type => 'tag'}],
+        :body => {:data => [{:id => tag_data[:name], :type => 'tag'}],
                   :included => included_data})
 
     result = Flapjack::Diner.check_link_tags(check_data[:id], :include => 'rules')
-    expect(result).to eq([{:id => tag_data[:id], :type => 'tag'}])
-    expect(Flapjack::Diner.context[:included]).to eq(
-      'tag'  => {tag_data[:id] => resultify(included_data[0])},
-      'rule' => {rule_data[:id] => resultify(included_data[1])}
-    )
+    expect(result).to eq([{:id => tag_data[:name], :type => 'tag'}])
+    expect(Flapjack::Diner.context[:included]).to eq([resultify(included_data[0]),
+      resultify(included_data[1])])
   end
 
   it 'updates tags for a check' do
@@ -100,12 +98,12 @@ describe Flapjack::Diner::Relationships, :pact => true do
       upon_receiving("a PATCH request updating tags for a check").
       with(:method => :patch, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.update_check_link_tags(check_data[:id],
-      tag_data[:id])
+      tag_data[:name])
     expect(result).to be true
   end
 
@@ -127,12 +125,12 @@ describe Flapjack::Diner::Relationships, :pact => true do
       upon_receiving("a DELETE request deleting a tag from a check").
       with(:method => :delete, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:id], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:name], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.delete_check_link_tags(check_data[:id],
-      tag_data[:id])
+      tag_data[:name])
     expect(result).to be true
   end
 
@@ -141,13 +139,13 @@ describe Flapjack::Diner::Relationships, :pact => true do
       upon_receiving("a DELETE request deleting two tags from a check").
       with(:method => :delete, :path => "/checks/#{check_data[:id]}/relationships/tags",
            :headers => {'Content-Type' => 'application/vnd.api+json'},
-           :body => {:data => [{:id => tag_data[:id], :type => 'tag'},
-                               {:id => tag_2_data[:id], :type => 'tag'}]}).
+           :body => {:data => [{:id => tag_data[:name], :type => 'tag'},
+                               {:id => tag_2_data[:name], :type => 'tag'}]}).
       will_respond_with(:status => 204,
                         :body => '')
 
     result = Flapjack::Diner.delete_check_link_tags(check_data[:id],
-      tag_data[:id], tag_2_data[:id])
+      tag_data[:name], tag_2_data[:name])
     expect(result).to be true
   end
 
@@ -164,48 +162,4 @@ describe Flapjack::Diner::Relationships, :pact => true do
     expect(result).to eq(:id => contact_data[:id], :type => 'contact')
   end
 
-  it "doesn't duplicate linked data references in included data" do
-    resp_check = check_json(check_data)
-    resp_check[:relationships] = {
-      :current_state => {
-        :data => {:type => 'state', :id => state_data[:id]}
-      },
-      :latest_notifications => {
-        :data => [{:type => 'state', :id => state_data[:id]}]
-      }
-    }
-
-    sd = state_data.delete_if {|k, _| [:created_at, :updated_at].include?(k)}
-
-    included_data = [
-      resp_check,
-      state_json(sd)
-    ]
-
-    flapjack.given("a check with a tag, current state and a latest notification exists").
-      upon_receiving("a GET request for a check (via tag)'s state and notifications").
-      with(:method => :get,
-           :path => "/tags/#{tag_data[:id]}/checks",
-           :query => 'include=checks.current_state%2Cchecks.latest_notifications').
-      will_respond_with(
-        :status => 200,
-        :headers => {'Content-Type' => 'application/vnd.api+json; supported-ext=bulk; charset=utf-8'},
-        :body => {
-          :data => [
-            {:id => check_data[:id], :type => 'check'},
-          ],
-          :included => included_data
-        })
-
-    result = Flapjack::Diner.tag_link_checks(tag_data[:id],
-      :include => ['checks.current_state', 'checks.latest_notifications'])
-    expect(result).to eq([
-      {:id => check_data[:id], :type => 'check'}
-    ])
-    expect(Flapjack::Diner.context[:included]).to eq(
-      'check' => {check_data[:id] => resultify(resp_check)},
-      'state' => {sd[:id] => resultify(state_json(sd))}
-    )
-  end
-
 end