contentful-management 1.10.1 → 2.0.0

data/spec/lib/contentful/management/client_spec.rb

@@ -291,7 +291,7 @@ module Contentful
 
         it 'effectively requests via proxy' do
           vcr(:proxy_request) {
-            expect(subject).to receive(:proxy_send).twice.and_call_original
+            expect(subject).to receive(:proxy_send).once.and_call_original
             subject.spaces.find('zh42n1tmsaiq')
           }
         end

data/spec/lib/contentful/management/content_type_spec.rb

@@ -10,49 +10,49 @@ module Contentful
       let!(:client) { Client.new(token) }
       let(:content_type_id) { '5DSpuKrl04eMAGQoQckeIq' }
 
-      subject { client.content_types }
+      subject { client.content_types(space_id, 'master') }
 
       describe '.all' do
         it 'class method also works' do
-          vcr('content_type/all') { expect(Contentful::Management::ContentType.all(client, space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('content_type/all') { expect(Contentful::Management::ContentType.all(client, space_id, 'master')).to be_kind_of Contentful::Management::Array }
         end
         it 'returns a Contentful::Array' do
-          vcr('content_type/all') { expect(subject.all(space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('content_type/all') { expect(subject.all).to be_kind_of Contentful::Management::Array }
         end
         it 'builds a Contentful::Management::ContentType object' do
-          vcr('content_type/all') { expect(subject.all(space_id).first).to be_kind_of Contentful::Management::ContentType }
+          vcr('content_type/all') { expect(subject.all.first).to be_kind_of Contentful::Management::ContentType }
         end
       end
 
       describe '.all_published' do
         let!(:space_id) { 'bjwq7b86vgmm' }
         it 'class method also works' do
-          vcr('content_type/all_public') { expect(Contentful::Management::ContentType.all_published(client, space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('content_type/all_public') { expect(Contentful::Management::ContentType.all_published(client, space_id, 'master')).to be_kind_of Contentful::Management::Array }
         end
         it 'returns a Contentful::Array' do
-          vcr('content_type/all_public') { expect(subject.all_published(space_id)).to be_kind_of Contentful::Management::Array }
+          vcr('content_type/all_public') { expect(subject.all_published).to be_kind_of Contentful::Management::Array }
         end
         it 'builds a Contentful::Management::ContentType object' do
-          vcr('content_type/all_public') { expect(subject.all_published(space_id).first).to be_kind_of Contentful::Management::ContentType }
+          vcr('content_type/all_public') { expect(subject.all_published.first).to be_kind_of Contentful::Management::ContentType }
         end
       end
 
       describe '.find' do
         it 'class method also works' do
-          vcr('content_type/find') { expect(Contentful::Management::ContentType.find(client, space_id, content_type_id)).to be_kind_of Contentful::Management::ContentType }
+          vcr('content_type/find') { expect(Contentful::Management::ContentType.find(client, space_id, 'master', content_type_id)).to be_kind_of Contentful::Management::ContentType }
         end
         it 'returns a Contentful::Management::ContentType' do
-          vcr('content_type/find') { expect(subject.find(space_id, content_type_id)).to be_kind_of Contentful::Management::ContentType }
+          vcr('content_type/find') { expect(subject.find(content_type_id)).to be_kind_of Contentful::Management::ContentType }
         end
         it 'returns the content_type for a given key' do
           vcr('content_type/find') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             expect(content_type.id).to eql content_type_id
           end
         end
         it 'returns an error when content_type does not found' do
           vcr('content_type/find_not_found') do
-            result = subject.find(space_id, 'not_exist')
+            result = subject.find('not_exist')
             expect(result).to be_kind_of Contentful::Management::NotFound
           end
         end
@@ -61,7 +61,7 @@ module Contentful
       describe '#destroy' do
         it 'returns Contentful::BadRequest error when content type is activated' do
           vcr('content_type/destroy_activated') do
-            result = subject.find(space_id, '66jvD8UhNKmWGk24KKq0EW').destroy
+            result = subject.find('66jvD8UhNKmWGk24KKq0EW').destroy
             expect(result).to be_kind_of Contentful::Management::BadRequest
             message = [
               "HTTP status code: 400 Bad Request",
@@ -73,7 +73,7 @@ module Contentful
 
         it 'returns true when content type is not activated' do
           vcr('content_type/destroy') do
-            result = subject.find(space_id, '66jvD8UhNKmWGk24KKq0EW').destroy
+            result = subject.find('66jvD8UhNKmWGk24KKq0EW').destroy
             expect(result).to eql true
           end
         end
@@ -83,13 +83,13 @@ module Contentful
         let(:active_content) { '4EnwylPOikyMGUIy8uQgQY' }
         it 'returns Contentful::Management::ContentType' do
           vcr('content_type/activate') do
-            result = subject.find(space_id, active_content).activate
+            result = subject.find(active_content).activate
             expect(result).to be_kind_of Contentful::Management::ContentType
           end
         end
         it 'increases object version' do
           vcr('content_type/activate') do
-            content_type = subject.find(space_id, active_content)
+            content_type = subject.find(active_content)
             initial_version = content_type.sys[:version]
             content_type.activate
             expect(content_type.sys[:version]).to eql initial_version + 1
@@ -97,7 +97,7 @@ module Contentful
         end
         it 'returns error when not valid version' do
           vcr('content_type/activate_with_invalid_version') do
-            content_type = subject.find(space_id, active_content)
+            content_type = subject.find(active_content)
             content_type.sys[:version] = -1
             result = content_type.activate
             expect(result).to be_kind_of Contentful::Management::Conflict
@@ -109,14 +109,14 @@ module Contentful
         let(:deactivate_content) { '4EnwylPOikyMGUIy8uQgQY' }
         it 'returns Contentful::Management::ContentType' do
           vcr('content_type/deactivate') do
-            content_type = subject.find(space_id, deactivate_content)
+            content_type = subject.find(deactivate_content)
             result = content_type.deactivate
             expect(result).to be_kind_of Contentful::Management::ContentType
           end
         end
         it 'increases object version' do
           vcr('content_type/deactivate_with_version_change') do
-            content_type = subject.find(space_id, deactivate_content)
+            content_type = subject.find(deactivate_content)
             initial_version = content_type.sys[:version]
             content_type.activate
             expect(content_type.sys[:version]).to eql initial_version + 1
@@ -124,13 +124,13 @@ module Contentful
         end
         it 'returns error when has entries' do
           vcr('content_type/deactivate_with_entries') do
-            result = subject.find(space_id, '5DSpuKrl04eMAGQoQckeIq').deactivate
+            result = subject.find('5DSpuKrl04eMAGQoQckeIq').deactivate
             expect(result).to be_kind_of Contentful::Management::BadRequest
           end
         end
         it 'returns error message when already deactivated' do
           vcr('content_type/deactivate_already_deactivated') do
-            content_type = subject.find(space_id, deactivate_content)
+            content_type = subject.find(deactivate_content)
             content_type.sys[:version] = -1
             result = content_type.deactivate
             message = [
@@ -145,14 +145,14 @@ module Contentful
       describe '#active?' do
         it 'returns true if content_type is active' do
           vcr('content_type/activated_true') do
-            content_type = subject.find(space_id, '4EnwylPOikyMGUIy8uQgQY')
+            content_type = subject.find('4EnwylPOikyMGUIy8uQgQY')
             content_type.activate
             expect(content_type.active?).to be_truthy
           end
         end
         it 'returns false if content_type is not active' do
           vcr('content_type/activated_false') do
-            content_type = subject.find(space_id, '4EnwylPOikyMGUIy8uQgQY')
+            content_type = subject.find('4EnwylPOikyMGUIy8uQgQY')
             content_type.deactivate
             expect(content_type.active?).to be_falsey
           end
@@ -166,7 +166,6 @@ module Contentful
         it 'creates a content_type within a space without id and without fields' do
           vcr('content_type/create') do
             content_type = subject.create(
-              space_id,
               name: content_type_name,
               description: content_type_description
             )
@@ -180,7 +179,6 @@ module Contentful
           vcr('content_type/create_content_type_with_id') do
             content_type_id = 'custom_id'
             content_type = subject.create(
-              space_id,
               name: content_type_name,
               id: content_type_id
             )
@@ -199,7 +197,6 @@ module Contentful
               field.type = field_type
               field.link_type = 'Entry' if field_type == 'Link'
               content_type = subject.create(
-                space_id,
                 name: "#{ field_type }",
                 description: "Content type with #{ field_type } field",
                 fields: [field]
@@ -231,13 +228,13 @@ module Contentful
             name_field.name = 'name'
             name_field.type = 'Symbol'
 
-            content_type = space.content_types.new
-            content_type.id = 'omitted_ct'
-            content_type.name = 'Omitted CT'
-            content_type.fields = [omitted_field, name_field]
-            content_type.display_field = 'name'
+            content_type = client.content_types(space.id, 'master').create(
+              id: 'omitted_ct',
+              name: 'Omitted CT',
+              fields: [omitted_field, name_field],
+              display_field: 'name'
+            )
 
-            content_type.save
             content_type.activate
 
             content_type.reload
@@ -259,7 +256,7 @@ module Contentful
         let(:content_type_id) { 'qw3F2rn3FeoOiceqAiCSC' }
         it 'updates content_type name and description' do
           vcr('content_type/update') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.update(name: content_type_name, description: content_type_description)
             expect(content_type.name).to eq content_type_name
             expect(content_type.description).to eq content_type_description
@@ -268,7 +265,7 @@ module Contentful
 
         it 'updates content_type with fields (leave fields untouched)' do
           vcr('content_type/update_with_fields') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.update(name: content_type_name)
             expect(content_type.name).to eq content_type_name
             expect(content_type.fields.size).to eq 2
@@ -281,7 +278,7 @@ module Contentful
             field.id = 'blog_author'
             field.name = 'Author of blog'
             field.type = 'Text'
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.update(fields: content_type.fields + [field])
             expect(content_type.fields.size).to eq 5
           end
@@ -290,7 +287,7 @@ module Contentful
         it 'updates content_type updating existing field' do
           vcr('content_type/update_change_field_name') do
             new_field_name = 'blog_author'
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             field = content_type.fields.first
             field.name = new_field_name
             content_type.update(fields: content_type.fields)
@@ -301,7 +298,7 @@ module Contentful
 
         it 'updates content_type deleting existing field' do
           vcr('content_type/update_remove_field') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             field = content_type.fields.first
             content_type.update(fields: [field])
             expect(content_type.fields.size).to eq 1
@@ -311,7 +308,9 @@ module Contentful
         it 'update with multiple locales' do
           vcr('content_type/entry/update_only_with_localized_fields') do
             space = client.spaces.find('v2umtz8ths9v')
-            entry = space.entries.find('2dEkgsQRnSW2QuW4AMaa86')
+            client.content_types(space.id, 'master').all # warmup cache
+
+            entry = client.entries(space.id, 'master').find('2dEkgsQRnSW2QuW4AMaa86')
             entry.name_with_locales = {'en-US' => 'Contentful EN up', 'de-DE' => 'Contentful DE up', 'pl-PL' => 'Contentful PL up'}
             entry.description_with_locales = {'en-US' => 'Description EN up', 'de-DE' => 'Description DE up', 'pl-PL' => 'Description PL up'}
             entry.save
@@ -324,7 +323,7 @@ module Contentful
       describe '#save' do
         it 'updated content type' do
           vcr('content_type/save_updated') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.name = 'NewName'
             content_type.save
             expect(content_type).to be_kind_of Contentful::Management::ContentType
@@ -334,7 +333,7 @@ module Contentful
 
         it 'with new field' do
           vcr('content_type/save_with_added_field') do
-            content_type = subject.find(space_id, '2tDzYAg5MM6sIkwsOmM0Kc')
+            content_type = subject.find('2tDzYAg5MM6sIkwsOmM0Kc')
             field = Contentful::Management::Field.new
             field.id = 'blog_title'
             field.name = 'Blog Title'
@@ -350,14 +349,15 @@ module Contentful
         it 'saves new object' do
           vcr('content_type/save_new') do
             space = client.spaces.find(space_id)
-            content_type = space.content_types.new
-            content_type.name = 'Post title'
             field = Contentful::Management::Field.new
             field.id = 'my_text_field'
             field.name = 'My Text Field'
             field.type = 'Text'
-            content_type.fields = [field]
-            content_type.save
+
+            content_type = client.content_types(space.id, 'master').create(
+              name: 'Post title',
+              fields: [field]
+            )
             expect(content_type).to be_kind_of Contentful::Management::ContentType
             expect(content_type.name).to eq 'Post title'
             expect(content_type.fields.size).to eq 1
@@ -370,14 +370,14 @@ module Contentful
         let(:field_type) { 'Text' }
         it 'creates new field' do
           vcr('content_type/fields/create') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.fields.create(id: field_id, name: 'Eye color', type: field_type)
             expect(content_type.fields.size).to eq 12
           end
         end
         it 'creates new Link field with additional parameters' do
           vcr('content_type/fields/create_with_params') do
-            content_type = subject.find(space_id, 'qw3F2rn3FeoOiceqAiCSC')
+            content_type = subject.find('qw3F2rn3FeoOiceqAiCSC')
             content_type.fields.create(id: 'blog_avatar', name: 'Blog avatar',
                                        type: 'Link',
                                        link_type: 'Asset',
@@ -394,7 +394,7 @@ module Contentful
         end
         it 'creates new Array field with additional parameters' do
           vcr('content_type/fields/create_array_with_params') do
-            content_type = subject.find(space_id, '6xzrdCr33OMAeIYUgs6UKi')
+            content_type = subject.find('6xzrdCr33OMAeIYUgs6UKi')
             items = Contentful::Management::Field.new
             items.type = 'Link'
             items.link_type = 'Entry'
@@ -408,7 +408,7 @@ module Contentful
         end
         it 'updates existing field if matched id' do
           vcr('content_type/fields/update_field') do
-            content_type = subject.find(space_id, '5DSpuKrl04eMAGQoQckeIq')
+            content_type = subject.find('5DSpuKrl04eMAGQoQckeIq')
             updated_name = 'Eyes color'
             content_type.fields.create(id: field_id, name: updated_name, type: field_type)
             expect(content_type.fields.size).to eq 12
@@ -421,7 +421,7 @@ module Contentful
       describe '#fields.add' do
         it 'creates new field' do
           vcr('content_type/fields/add') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             field = Contentful::Management::Field.new
             field.id = 'symbol'
             field.name = 'Symbol'
@@ -437,7 +437,7 @@ module Contentful
       describe '#fields.destroy' do
         it 'deletes field by id' do
           vcr('content_type/fields/destroy') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             content_type.fields.destroy('blog_title')
             expect(content_type.fields.size).to eq 10
           end
@@ -447,7 +447,7 @@ module Contentful
       describe '#entries.create' do
         it 'with Text field' do
           vcr('content_type/entry/create') do
-            content_type = subject.find(space_id, content_type_id)
+            content_type = subject.find(content_type_id)
             entry = content_type.entries.create(name: 'Piotrek')
             expect(entry).to be_kind_of Contentful::Management::Entry
             expect(entry.fields[:name]).to eq 'Piotrek'
@@ -456,8 +456,8 @@ module Contentful
 
         it 'with entry' do
           vcr('content_type/entry/create_with_entries') do
-            entry_en = client.entries.find(space_id, 'Qa8TW5nPWgiU4MA6AGYgq')
-            content_type = subject.find(space_id, '6xzrdCr33OMAeIYUgs6UKi')
+            entry_en = client.entries(space_id, 'master').find('Qa8TW5nPWgiU4MA6AGYgq')
+            content_type = subject.find('6xzrdCr33OMAeIYUgs6UKi')
             entry = content_type.entries.create(blog_name: 'Piotrek',
                                                 blog_entry: entry_en,
                                                 blog_entries: [entry_en, entry_en, entry_en])
@@ -473,7 +473,7 @@ module Contentful
         context 'for  multiple locales' do
           it 'for Text field' do
             vcr('content_type/entry/create_with_multiple_locales') do
-              content_type = subject.find(space_id, '4EnwylPOikyMGUIy8uQgQY')
+              content_type = subject.find('4EnwylPOikyMGUIy8uQgQY')
               entry = content_type.entries.new
               entry.post_title_with_locales = {'en-US' => 'Company logo', 'pl' => 'Firmowe logo'}
               entry.post_body_with_locales = {'en-US' => 'Story about Contentful...', 'pl' => 'Historia o Contentful...'}
@@ -489,7 +489,7 @@ module Contentful
           end
           it 'with camel case api id' do
             vcr('content_type/entry/create_with_camel_case_id_to_multiple_locales') do
-              content_type = subject.find(space_id, '4esHTHIVgc0uWkiwGwOsa6')
+              content_type = subject.find('4esHTHIVgc0uWkiwGwOsa6')
               entry = content_type.entries.new
               entry.car_mark_with_locales = {'en-US' => 'Mercedes Benz', 'pl' => 'Mercedes'}
               entry.car_city_plate_with_locales = {'en-US' => 'en', 'pl' => 'bia'}
@@ -509,12 +509,11 @@ module Contentful
           it 'with entries' do
             vcr('content_type/entry/create_with_entries_for_multiple_locales') do
               space = client.spaces.find(space_id)
-              space.content_types # filling cache
 
-              entry_en = space.entries.find('664EPJ6zHqAeMO6O0mGggU')
-              entry_pl = space.entries.find('664EPJ6zHqAeMO6O0mGggU')
+              entry_en = client.entries(space.id, 'master').find('664EPJ6zHqAeMO6O0mGggU')
+              entry_pl = client.entries(space.id, 'master').find('664EPJ6zHqAeMO6O0mGggU')
 
-              content_type = space.content_types.find('6xzrdCr33OMAeIYUgs6UKi')
+              content_type = client.content_types(space.id, 'master').find('6xzrdCr33OMAeIYUgs6UKi')
               entry = content_type.entries.new
               entry.blog_name_with_locales = {'en-US' => 'Contentful en', 'pl' => 'Contentful pl'}
               entry.blog_entries_with_locales = {'en-US' => [entry_en, entry_en], 'pl' => [entry_pl, entry_pl]}
@@ -527,12 +526,11 @@ module Contentful
           it 'with assets' do
             vcr('content_type/entry/create_with_entries_for_multiple_locales') do
               space = client.spaces.find(space_id)
-              space.content_types # filling cache
 
-              entry_en = space.entries.find('664EPJ6zHqAeMO6O0mGggU')
-              entry_pl = space.entries.find('664EPJ6zHqAeMO6O0mGggU')
+              entry_en = client.entries(space.id, 'master').find('664EPJ6zHqAeMO6O0mGggU')
+              entry_pl = client.entries(space.id, 'master').find('664EPJ6zHqAeMO6O0mGggU')
 
-              content_type = space.content_types.find('6xzrdCr33OMAeIYUgs6UKi')
+              content_type = client.content_types(space.id, 'master').find('6xzrdCr33OMAeIYUgs6UKi')
               entry = content_type.entries.new
               entry.blog_name_with_locales = {'en-US' => 'Contentful en', 'pl' => 'Contentful pl'}
               entry.blog_entries_with_locales = {'en-US' => [entry_en, entry_en], 'pl' => [entry_pl, entry_pl]}
@@ -545,7 +543,7 @@ module Contentful
           context 'only to unlocalized fields' do
             it 'return entry with valid parameters' do
               vcr('content_type/entry/create_only_with_localized_fields') do
-                content_type = subject.find('v2umtz8ths9v', 'category_content_type')
+                content_type = described_class.find(client, 'v2umtz8ths9v', 'master', 'category_content_type')
                 entry = content_type.entries.new
                 entry.name_with_locales = {'en-US' => 'Contentful EN', 'de-DE' => 'Contentful DE', 'pl-PL' => 'Contentful PL'}
                 entry.description_with_locales = {'en-US' => 'Description EN', 'de-DE' => 'Description DE', 'pl-PL' => 'Description PL'}
@@ -559,7 +557,7 @@ module Contentful
           context 'only to unlocalized fields' do
             it 'return entry with valid parameters' do
               vcr('content_type/entry/create_to_single_locale_only_with_localized_fields') do
-                content_type = subject.find('v2umtz8ths9v', 'category_content_type')
+                content_type = described_class.find(client, 'v2umtz8ths9v', 'master', 'category_content_type')
                 entry = content_type.entries.new
                 entry.name = 'Some testing EN name'
                 entry.description = ' some testing EN description '
@@ -579,7 +577,7 @@ module Contentful
         it 'returns entries' do
           vcr('content_type/entry/all') do
             space = client.spaces.find(space_id)
-            content_type = space.content_types.find('category_content_type')
+            content_type = client.content_types(space.id, 'master').find('category_content_type')
             entries = content_type.entries.all
             expect(entries).to be_kind_of Contentful::Management::Array
             expect(entries.size).to eq 2
@@ -593,7 +591,7 @@ module Contentful
         let(:space_id) { 'bfsvtul0c41g' }
         it 'update the current version of the object to the version on the system' do
           vcr('content_type/reload') do
-            content_type = subject.find(space_id, 'category_content_type')
+            content_type = described_class.find(client, space_id, 'master', 'category_content_type')
             content_type.sys[:version] = 999
             update_ct = content_type.update(name: 'Updated content type name')
             expect(update_ct).to be_kind_of Contentful::Management::Conflict
@@ -608,7 +606,7 @@ module Contentful
 
       describe '#validations' do
         let(:space) { client.spaces.find('v2umtz8ths9v') }
-        let(:content_type) { space.content_types.find('category_content_type') }
+        let(:content_type) { client.content_types(space.id, 'master').find('category_content_type') }
 
         it "adds 'in validation' to a new field" do
           vcr('content_type/validation/in') do
@@ -654,7 +652,7 @@ module Contentful
         context 'range' do
           it 'adds `range` validation to field' do
             vcr('content_type/validation/range') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
 
               validation_range = Contentful::Management::Validation.new
               validation_range.range = {min: 30, max: 100}
@@ -666,7 +664,7 @@ module Contentful
           end
           it 'change `range` validation to existing field' do
             vcr('content_type/validation/range_update') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
 
               validation_range = Contentful::Management::Validation.new
               validation_range.range = {min: 50, max: 200}
@@ -679,7 +677,7 @@ module Contentful
         context 'present' do
           it 'adds `present` validation to field' do
             vcr('content_type/validation/present') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_present = Contentful::Management::Validation.new
               validation_present.present = true
               content_type.fields.create(id: 'present', name: 'Present', type: 'Text', validations: [validation_present])
@@ -691,7 +689,7 @@ module Contentful
         context 'regexp' do
           it 'adds `regexp` validation to field' do
             vcr('content_type/validation/regexp') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_regexp = Contentful::Management::Validation.new
               validation_regexp.regexp = {pattern: '^such', flags: 'im'}
               content_type.fields.create(id: 'text', name: 'Text', type: 'Text', validations: [validation_regexp])
@@ -704,7 +702,7 @@ module Contentful
         context 'linkContentType' do
           it 'adds `linkContentType` validation to field' do
             vcr('content_type/validation/link_content_type') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_link_content_type = Contentful::Management::Validation.new
               validation_link_content_type.link_content_type = ['post_content_type']
               content_type.fields.create(id: 'entries', validations: [validation_link_content_type])
@@ -716,7 +714,7 @@ module Contentful
         context 'linkMimetypeGroup' do
           it 'adds `linkMimetypeGroup` validation to field' do
             vcr('content_type/validation/link_mimetype_group') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_link_mimetype_group = Contentful::Management::Validation.new
               validation_link_mimetype_group.link_mimetype_group = 'image'
               content_type.fields.create(id: 'entries', validations: [validation_link_mimetype_group])
@@ -728,7 +726,7 @@ module Contentful
         context 'linkField' do
           it 'adds `linkField` validation to field' do
             vcr('content_type/validation/link_field') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_link_mimetype_group = Contentful::Management::Validation.new
               validation_link_mimetype_group.link_field = true
               content_type.fields.create(id: 'link_field', validations: [validation_link_mimetype_group])
@@ -741,7 +739,7 @@ module Contentful
           let(:space) { client.spaces.find('iig6ari2cj2t') }
           it 'adds `unique` validation to field' do
             vcr('content_type/validation/unique') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_unique = Contentful::Management::Validation.new
               validation_unique.unique = true
               content_type.fields.create(id: 'symbol', name: 'Slug', type: 'Symbol', validations: [validation_unique])
@@ -754,7 +752,7 @@ module Contentful
         context 'add multiple validations' do
           it 'create field with multiple validations' do
             vcr('content_type/validation/multiple_add') do
-              content_type = space.content_types.find('1JrDv4JJsYuY4KGEEgAsQU')
+              content_type = client.content_types(space.id, 'master').find('1JrDv4JJsYuY4KGEEgAsQU')
               validation_in = Contentful::Management::Validation.new
               validation_in.in = %w( foo bar baz)
               validation_regexp = Contentful::Management::Validation.new
@@ -784,7 +782,8 @@ module Contentful
             field.type = 'Array'
             field.items = items
 
-            content_type = space.content_types.new
+            content_type = client.content_types(space.id, 'master').new
+            content_type.space = space
             content_type.name = 'Testing Content Types'
             content_type.fields = [field]
             content_type.save
@@ -813,7 +812,8 @@ module Contentful
             field.name = 'name'
             field.type = 'Symbol'
 
-            content_type = space.content_types.new
+            content_type = client.content_types(space.id, 'master').new
+            content_type.space = space
             content_type.id = 'isssue_79_ct'
             content_type.name = 'Issue 79 CT'
             content_type.fields = [field]