contentful-management 1.10.1 → 2.0.0

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

@@ -23,14 +23,14 @@ module Contentful
 
       let!(:client) { Client.new(token) }
 
-      subject { client.editor_interfaces }
+      subject { client.editor_interfaces(space_id, 'master', content_type_id) }
 
       describe '.default' do
         it 'class method also works' do
-          vcr('editor_interfaces/default_for_space') { expect(Contentful::Management::EditorInterface.default(client, space_id, content_type_id)).to be_kind_of Contentful::Management::EditorInterface }
+          vcr('editor_interfaces/default_for_space') { expect(Contentful::Management::EditorInterface.default(client, space_id, 'master', content_type_id)).to be_kind_of Contentful::Management::EditorInterface }
         end
         it 'builds a Contentful::Management::Locale object' do
-          vcr('editor_interfaces/default_for_space') { expect(subject.default(space_id, content_type_id)).to be_kind_of Contentful::Management::EditorInterface }
+          vcr('editor_interfaces/default_for_space') { expect(subject.default).to be_kind_of Contentful::Management::EditorInterface }
         end
       end
 
@@ -39,7 +39,7 @@ module Contentful
 
         it 'can update the editor_interface' do
           vcr('editor_interfaces/update') do
-            editor_interface = subject.default(space_id, content_type_id)
+            editor_interface = described_class.default(client, space_id, 'master', content_type_id)
 
             expect(editor_interface.controls.first['widgetId']).to eq 'singleline'
 

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

@@ -18,27 +18,27 @@ end
 module Contentful
   module Management
     describe Entry do
-      let(:token) { '<ACCESS_TOKEN>' }
+      let(:token) { ENV.fetch('CF_TEST_CMA_TOKEN', '<ACCESS_TOKEN>') }
       let(:space_id) { 'yr5m0jky5hsh' }
       let(:entry_id) { '4Rouux8SoUCKwkyCq2I0E0' }
 
       let!(:client) { Client.new(token) }
 
-      subject { client.entries }
+      subject { client.entries(space_id, 'master') }
 
       describe '.all' do
         it 'class method also works' do
-          vcr('entry/all') { expect(Contentful::Management::Entry.all(client, 'bfsvtul0c41g')).to be_kind_of Contentful::Management::Array }
+          vcr('entry/all') { expect(Contentful::Management::Entry.all(client, 'bfsvtul0c41g', 'master')).to be_kind_of Contentful::Management::Array }
         end
         it 'returns a Contentful::Array' do
-          vcr('entry/all') { expect(subject.all('bfsvtul0c41g')).to be_kind_of Contentful::Management::Array }
+          vcr('entry/all') { expect(described_class.all(client, 'bfsvtul0c41g', 'master')).to be_kind_of Contentful::Management::Array }
         end
         it 'builds a Contentful::Management::Entry object' do
-          vcr('entry/all') { expect(subject.all('bfsvtul0c41g').first).to be_kind_of Contentful::Management::Entry }
+          vcr('entry/all') { expect(described_class.all(client, 'bfsvtul0c41g', 'master').first).to be_kind_of Contentful::Management::Entry }
         end
         it 'returns entries in context of specified content type' do
           vcr('entry/content_type_entires') do
-            entries = subject.all('bfsvtul0c41g', content_type: 'category_content_type')
+            entries = described_class.all(client, 'bfsvtul0c41g', 'master', content_type: 'category_content_type')
             expect(entries).to be_kind_of Contentful::Management::Array
             expect(entries.first).to be_kind_of Contentful::Management::Entry
             expect(entries.first.sys[:contentType].id).to eq 'category_content_type'
@@ -46,7 +46,7 @@ module Contentful
         end
         it 'return limited number of entries with next_page' do
           vcr('entry/limited_entries') do
-            entries = subject.all('bfsvtul0c41g', limit: 20, skip: 2)
+            entries = described_class.all(client, 'bfsvtul0c41g', 'master', limit: 20, skip: 2)
             expect(entries).to be_kind_of Contentful::Management::Array
             expect(entries.limit).to eq 20
             expect(entries.skip).to eq 2
@@ -55,57 +55,39 @@ module Contentful
         end
         it 'supports select operator' do
           vcr('entry/select_operator') do
-            nyancat = subject.all('cfexampleapi', 'sys.id' => 'nyancat', content_type: 'cat', select: 'fields.lives').first
+            nyancat = described_class.all(client, 'cfexampleapi', 'master', 'sys.id' => 'nyancat', content_type: 'cat', select: 'fields.lives').first
             expect(nyancat.fields).to eq({lives: 1337})
           end
         end
       end
 
-      describe '.all_published' do
-        let!(:space_id) { 'bjwq7b86vgmm' }
-
-        before :each do
-          expect_any_instance_of(Contentful::Management::Entry.client_association_class).to receive(:warn)
-        end
-
-        it 'class method also works' do
-          vcr('entry/all_public') { expect(Contentful::Management::Entry.all_published(client, space_id)).to be_kind_of Contentful::Management::Array }
-        end
-        it 'returns a Contentful::Array' do
-          vcr('entry/all_public') { expect(subject.all_published(space_id)).to be_kind_of Contentful::Management::Array }
-        end
-        it 'builds a Contentful::Management::Entry object' do
-          vcr('entry/all_public') { expect(subject.all_published(space_id).first).to be_kind_of Contentful::Management::Entry }
-        end
-      end
-
       describe '.find' do
         it 'class method also works' do
-          vcr('entry/find') { expect(Contentful::Management::Entry.find(client, space_id, entry_id)).to be_kind_of Contentful::Management::Entry }
+          vcr('entry/find') { expect(Contentful::Management::Entry.find(client, space_id, 'master', entry_id)).to be_kind_of Contentful::Management::Entry }
         end
 
         it 'returns null as nil on empty Symbols' do
           vcr('entry/find-with-null-symbols') do
             space = client.spaces.find(space_id)
-            entry = space.entries.find(entry_id)
+            entry = client.entries(space.id, 'master').find(entry_id)
             expect(entry.fields[:videoid]).to_not be_kind_of(String)
             expect(entry.fields[:videoid]).to be_nil
           end
         end
 
         it 'returns a Contentful::Management::Entry' do
-          vcr('entry/find') { expect(subject.find(space_id, entry_id)).to be_kind_of Contentful::Management::Entry }
+          vcr('entry/find') { expect(subject.find(entry_id)).to be_kind_of Contentful::Management::Entry }
         end
 
         it 'returns the entry for a given key' do
           vcr('entry/find') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             expect(entry.id).to eql entry_id
           end
         end
         it 'returns an error when entry does not exists' do
           vcr('entry/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
@@ -113,14 +95,14 @@ module Contentful
           let!(:client) { Client.new(token, raise_errors: true) }
           it 'returns an error when entry does not exists' do
             expect_vcr('entry/find_not_found') do
-              subject.find(space_id, 'not_exist')
+              subject.find('not_exist')
             end.to raise_error Contentful::Management::NotFound
           end
         end
 
         it 'returns an error when service is unavailable' do
           vcr('entry/service_unavailable') do
-            result = subject.find(space_id, 'not_exist')
+            result = subject.find('not_exist')
             expect(result).to be_kind_of Contentful::Management::ServiceUnavailable
             message = [
               "HTTP status code: 503 Service Unavailable",
@@ -134,7 +116,7 @@ module Contentful
       describe '#destroy' do
         it 'returns Contentful::BadRequest error when content type is published' do
           vcr('entry/destory_published') do
-            result = subject.find(space_id, '3U7JqGuVzOWIimU40mKeem').destroy
+            result = subject.find('3U7JqGuVzOWIimU40mKeem').destroy
             expect(result).to be_kind_of Contentful::Management::BadRequest
             message = [
               "HTTP status code: 400 Bad Request",
@@ -145,7 +127,7 @@ module Contentful
         end
         it 'returns true when entry is not published' do
           vcr('entry/destroy') do
-            result = subject.find(space_id, '3U7JqGuVzOWIimU40mKeem').destroy
+            result = subject.find('3U7JqGuVzOWIimU40mKeem').destroy
             expect(result).to eq true
           end
         end
@@ -154,7 +136,7 @@ module Contentful
       describe '#unpublish' do
         it 'unpublish the entry' do
           vcr('entry/unpublish') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             initial_version = entry.sys[:version]
             entry.unpublish
             expect(entry).to be_kind_of Contentful::Management::Entry
@@ -164,7 +146,7 @@ module Contentful
 
         it 'returns BadRequest error when already unpublished' do
           vcr('entry/unpublish_already_unpublished') do
-            result = subject.find(space_id, entry_id).unpublish
+            result = subject.find(entry_id).unpublish
             expect(result).to be_kind_of Contentful::Management::BadRequest
             message = [
               "HTTP status code: 400 Bad Request",
@@ -172,7 +154,7 @@ module Contentful
             ].join("\n")
             expect(result.message).to eq message
             expect(result.error[:message]).to eq 'Not published'
-            expect(result.error[:url]).to eq 'spaces/yr5m0jky5hsh/entries/4Rouux8SoUCKwkyCq2I0E0/published'
+            expect(result.error[:url]).to eq 'spaces/yr5m0jky5hsh/environments/master/entries/4Rouux8SoUCKwkyCq2I0E0/published'
             expect(result.error[:details]).to eq "{\n  \"sys\": {\n    \"type\": \"Error\",\n    \"id\": \"BadRequest\"\n  },\n  \"message\": \"Not published\"\n}\n"
           end
         end
@@ -181,7 +163,7 @@ module Contentful
       describe '#publish' do
         it 'returns Contentful::Management::Entry' do
           vcr('entry/publish') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             initial_version = entry.sys[:version]
             entry.publish
             expect(entry).to be_kind_of Contentful::Management::Entry
@@ -190,7 +172,7 @@ module Contentful
         end
         it 'returns BadRequest error when already published' do
           vcr('entry/publish_already_published') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             entry.sys[:version] = -1
             result = entry.publish
             expect(result).to be_kind_of Contentful::Management::Conflict
@@ -201,14 +183,14 @@ module Contentful
       describe '#published?' do
         it 'returns true if entry is published' do
           vcr('entry/published_true') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             entry.publish
             expect(entry.published?).to be_truthy
           end
         end
         it 'returns false if entry is not published' do
           vcr('entry/published_false') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             entry.unpublish
             expect(entry.published?).to be_falsey
           end
@@ -218,7 +200,7 @@ module Contentful
       describe '#unarchive' do
         it 'unarchive the entry' do
           vcr('entry/unarchive') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             initial_version = entry.sys[:version]
             entry.unarchive
             expect(entry).to be_kind_of Contentful::Management::Entry
@@ -227,14 +209,14 @@ module Contentful
         end
         it 'returns BadRequest error when already unpublished' do
           vcr('entry/unarchive_already_unarchived') do
-            result = subject.find(space_id, entry_id).unarchive
+            result = subject.find(entry_id).unarchive
             expect(result).to be_kind_of Contentful::Management::BadRequest
           end
         end
 
         it 'returns BadRequest error when already unarchived' do
           vcr('entry/unarchive_already_unarchived') do
-            result = subject.find(space_id, entry_id).unarchive
+            result = subject.find(entry_id).unarchive
             expect(result).to be_kind_of Contentful::Management::BadRequest
             message = [
               "HTTP status code: 400 Bad Request",
@@ -248,7 +230,7 @@ module Contentful
       describe '#archive' do
         it 'entry' do
           vcr(:'entry/archive') do
-            entry = subject.find(space_id, '3U7JqGuVzOWIimU40mKeem')
+            entry = subject.find('3U7JqGuVzOWIimU40mKeem')
             initial_version = entry.sys[:version]
             entry.archive
             expect(entry).to be_kind_of Contentful::Management::Entry
@@ -257,7 +239,7 @@ module Contentful
         end
         it 'returns error when archive published entry' do
           vcr('entry/archive_published') do
-            entry = subject.find(space_id, entry_id).archive
+            entry = subject.find(entry_id).archive
             expect(entry).to be_kind_of Contentful::Management::BadRequest
             message = [
               "HTTP status code: 400 Bad Request",
@@ -271,14 +253,14 @@ module Contentful
       describe '#archived?' do
         it 'returns true if entry is archived' do
           vcr('entry/archived_true') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             entry.archive
             expect(entry.archived?).to be_truthy
           end
         end
         it 'returns false if entry is not archived' do
           vcr('entry/archived_false') do
-            entry = subject.find(space_id, entry_id)
+            entry = subject.find(entry_id)
             entry.unarchive
             expect(entry.archived?).to be_falsey
           end
@@ -287,18 +269,18 @@ module Contentful
 
       describe '.create' do
         let(:content_type_id) { '5DSpuKrl04eMAGQoQckeIq' }
-        let(:content_type) { client.content_types.find(space_id, content_type_id) }
+        let(:content_type) { client.content_types(space_id, 'master').find(content_type_id) }
 
         it 'create with all attributes' do
           vcr('entry/create') do
-            content_type = client.content_types.find('ene4qtp2sh7u', '5BHZB1vi4ooq4wKcmA8e2c')
+            content_type = client.content_types('ene4qtp2sh7u', 'master').find('5BHZB1vi4ooq4wKcmA8e2c')
             location = Location.new.tap do |loc|
               loc.lat = 22.44
               loc.lon = 33.33
             end
-            file = client.assets.find('ene4qtp2sh7u', '2oNoT3vSAs82SOIQmKe0KG')
-            entry_att = subject.find('ene4qtp2sh7u', '60zYC7nY9GcKGiCYwAs4wm')
-            entry = subject.create(
+            file = client.assets('ene4qtp2sh7u', 'master').find('2oNoT3vSAs82SOIQmKe0KG')
+            entry_att = described_class.find(client, 'ene4qtp2sh7u', 'master', '60zYC7nY9GcKGiCYwAs4wm')
+            entry = client.entries('ene4qtp2sh7u', 'master').create(
               content_type,
               name: 'Test name',
               number: 30,
@@ -343,7 +325,7 @@ module Contentful
 
         it 'with entry' do
           vcr('entry/create_with_entry') do
-            entry_att = client.entries.find(space_id, '4o6ghKSmSko4i828YCYaEo')
+            entry_att = client.entries(space_id, 'master').find('4o6ghKSmSko4i828YCYaEo')
             entry = subject.create(content_type, name: 'EntryWithEntry', age: 20, entry: entry_att)
             expect(entry.name).to eq 'EntryWithEntry'
             expect(entry.age).to eq 20
@@ -353,7 +335,7 @@ module Contentful
 
         it 'with entries' do
           vcr('entry/create_with_entries') do
-            entry_att = subject.find(space_id, '1d1QDYzeiyWmgqQYysae8u')
+            entry_att = subject.find('1d1QDYzeiyWmgqQYysae8u')
             new_entry = subject.create(content_type,
                                        name: 'EntryWithEntries',
                                        age: 20,
@@ -382,7 +364,7 @@ module Contentful
 
         it 'with entry inherited from Contentful::Entry' do
           vcr('entry/create_with_entry') do
-            entry_att = Contentful::BaseEntry.new(client.entries.find(space_id, '4o6ghKSmSko4i828YCYaEo'))
+            entry_att = Contentful::BaseEntry.new(client.entries(space_id, 'master').find('4o6ghKSmSko4i828YCYaEo'))
             entry = subject.create(content_type, name: 'EntryWithEntry', age: 20, entry: entry_att)
             expect(entry.name).to eq 'EntryWithEntry'
             expect(entry.age).to eq 20
@@ -392,7 +374,7 @@ module Contentful
 
         it 'with entries inherited from Contentful::Entry' do
           vcr('entry/create_with_entries') do
-            entry_att = Contentful::BaseEntry.new(subject.find(space_id, '1d1QDYzeiyWmgqQYysae8u'))
+            entry_att = Contentful::BaseEntry.new(subject.find('1d1QDYzeiyWmgqQYysae8u'))
             new_entry = subject.create(content_type,
                                        name: 'EntryWithEntries',
                                        age: 20,
@@ -404,14 +386,14 @@ module Contentful
 
         it 'with asset' do
           vcr('entry/create_with_asset') do
-            asset = client.assets.find(space_id, 'codequest_id_test_custom')
+            asset = client.assets(space_id, 'master').find('codequest_id_test_custom')
             entry = subject.create(content_type, name: 'OneAsset', asset: asset)
             expect(entry.name).to eq 'OneAsset'
           end
         end
         it 'with assets' do
           vcr('entry/create_with_assets') do
-            asset = client.assets.find(space_id, 'codequest_id_test_custom')
+            asset = client.assets(space_id, 'master').find('codequest_id_test_custom')
             entry = subject.create(content_type, name: 'multiAssets', assets: [asset, asset, asset])
             expect(entry.name).to eq 'multiAssets'
           end
@@ -432,7 +414,7 @@ module Contentful
         it 'to specified locale' do
           vcr('entry/create_with_specified_locale') do
             space = client.spaces.find('s37a4pe35l1x')
-            ct = space.content_types.find('category_content_type')
+            ct = client.content_types(space.id, 'master').find('category_content_type')
             entry = ct.entries.create(name: 'Create test', description: 'Test - create entry with specified locale.', locale: 'pl-PL')
             expect(entry.name).to eq 'Create test'
           end
@@ -441,8 +423,8 @@ module Contentful
         it 'too many requests' do
           vcr('entry/too_many_requests') do
             space = client.spaces.find('286arvy86ry9')
-            invalid_entry = space.entries.find('1YNepnMpXGiMWikaKC4GG0')
-            ct = space.content_types.find('5lIEiXrCIoKoIKaSW2C8aa')
+            invalid_entry = client.entries(space.id, 'master').find('1YNepnMpXGiMWikaKC4GG0')
+            ct = client.content_types(space.id, 'master').find('5lIEiXrCIoKoIKaSW2C8aa')
             entry = ct.entries.create(name: 'Create test', entry: invalid_entry)
             publish = entry.publish
             expect(publish).to be_a RateLimitExceeded
@@ -454,8 +436,8 @@ module Contentful
           vcr('entry/too_many_requests_retry') do
             logger = RetryLoggerMock.new(STDOUT)
             space = Client.new(token, raise_errors: true, logger: logger).spaces.find('286arvy86ry9')
-            invalid_entry = space.entries.find('1YNepnMpXGiMWikaKC4GG0')
-            ct = space.content_types.find('5lIEiXrCIoKoIKaSW2C8aa')
+            invalid_entry = client.entries(space.id, 'master').find('1YNepnMpXGiMWikaKC4GG0')
+            ct = client.content_types(space.id, 'master').find('5lIEiXrCIoKoIKaSW2C8aa')
             entry = ct.entries.create(name: 'Create test', entry: invalid_entry)
             entry.publish
 
@@ -466,7 +448,7 @@ module Contentful
         it 'with just an id' do
           vcr('entry/create_with_just_id') do
             space = client.spaces.find('bbukbffokvih')
-            entry = space.content_types.all.first.entries.create({'id' => 'yol'})
+            entry = client.content_types(space.id, 'master').all.first.entries.create({'id' => 'yol'})
             entry.save
             expect(entry).to be_a Contentful::Management::Entry
           end
@@ -477,9 +459,9 @@ module Contentful
         let(:entry_id) { '1I3qWOiP8k2WWYCogKy88S' }
         it 'update entry' do
           vcr('entry/update') do
-            asset = client.assets.find(space_id, 'codequest_id_test_custom_id')
-            entry_att = subject.find(space_id, '1d1QDYzeiyWmgqQYysae8u')
-            entry = subject.find(space_id, '4o6ghKSmSko4i828YCYaEo')
+            asset = client.assets(space_id, 'master').find('codequest_id_test_custom_id')
+            entry_att = subject.find('1d1QDYzeiyWmgqQYysae8u')
+            entry = subject.find('4o6ghKSmSko4i828YCYaEo')
 
             location = Location.new
             location.lat = 22.44
@@ -507,7 +489,7 @@ module Contentful
 
         it 'update entry for custom locale' do
           vcr('entry/update_with_custom_locale') do
-            entry = subject.find(space_id, '3U7JqGuVzOWIimU40mKeem')
+            entry = subject.find('3U7JqGuVzOWIimU40mKeem')
             entry.locale = 'pl'
             result = entry.update(name: 'testName', bool: true)
             expect(result).to be_kind_of Contentful::Management::Entry
@@ -518,12 +500,12 @@ module Contentful
 
         it 'return Error when update not localized field' do
           vcr('entry/update_unlocalized_field') do
-            asset = client.assets.find(space_id, 'codequest_id_test_custom_id')
+            asset = client.assets(space_id, 'master').find('codequest_id_test_custom_id')
 
             location = Location.new
             location.lat = 22.44
             location.lon = 33.33
-            entry = subject.find(space_id, '3U7JqGuVzOWIimU40mKeem')
+            entry = subject.find('3U7JqGuVzOWIimU40mKeem')
             entry.locale = 'pl'
             result = entry.update(name: 'DoestMatter', bool: false, city: location, asset: asset)
             expect(result).to be_kind_of Contentful::Management::Error
@@ -533,7 +515,7 @@ module Contentful
         it 'can update boolean fields to `false`' do
           vcr('entry/update_bool_field') do
             space = client.spaces.find('fujuvqn6zcl1')
-            content_type = space.content_types.find('1kUEViTN4EmGiEaaeC6ouY')
+            content_type = client.content_types(space.id, 'master').find('1kUEViTN4EmGiEaaeC6ouY')
 
             q = content_type.entries.new
             q.name_with_locales = {'en-US' => 'Hello World'}
@@ -541,7 +523,7 @@ module Contentful
             expected = q.fields
             q.save
 
-            p = space.entries.find(q.id)
+            p = client.entries(space.id, 'master').find(q.id)
             expect(p.fields).to match(expected)
           end
         end
@@ -550,7 +532,7 @@ module Contentful
       describe '#save' do
         it 'save updated' do
           vcr('entry/save_update') do
-            entry = subject.find(space_id, '664EPJ6zHqAeMO6O0mGggU')
+            entry = subject.find('664EPJ6zHqAeMO6O0mGggU')
             entry.fields[:carMark] = 'Merc'
             entry.save
             expect(entry).to be_kind_of Contentful::Management::Entry
@@ -564,7 +546,9 @@ module Contentful
         it 'update the current version of the object to the version on the system' do
           vcr('entry/reload') do
             space = client.spaces.find(space_id)
-            entry = space.entries.find('2arjcjtY7ucC4AGeIOIkok')
+            client.content_types(space.id, 'master').all # warm-up cache
+
+            entry = client.entries(space.id, 'master').find('2arjcjtY7ucC4AGeIOIkok')
             entry.sys[:version] = 999
             update_entry = entry.update(post_title: 'Updated title')
             expect(update_entry).to be_kind_of Contentful::Management::Conflict
@@ -583,7 +567,7 @@ module Contentful
         context 'order' do
           it 'returns ordered entries by createdAt' do
             vcr('entry/search_filter/order_sys.createdAt') do
-              ordered_entries = space.entries.all(order: 'sys.createdAt')
+              ordered_entries = client.entries(space.id, 'master').all(order: 'sys.createdAt')
               expect(ordered_entries).to be_kind_of Contentful::Management::Array
               expect(ordered_entries.first).to be_kind_of Contentful::Management::Entry
               expect(ordered_entries.first.sys[:createdAt] < ordered_entries.to_a[4].sys[:createdAt]).to be_truthy
@@ -592,7 +576,7 @@ module Contentful
 
           it 'returns ordered entries by updatedAt' do
             vcr('entry/search_filter/order_sys.updatedAt') do
-              ordered_entries = space.entries.all(order: 'sys.updatedAt')
+              ordered_entries = client.entries(space.id, 'master').all(order: 'sys.updatedAt')
               expect(ordered_entries).to be_kind_of Contentful::Management::Array
               expect(ordered_entries.first).to be_kind_of Contentful::Management::Entry
               expect(ordered_entries.first.sys[:updatedAt] < ordered_entries.to_a[4].sys[:updatedAt]).to be_truthy
@@ -601,7 +585,7 @@ module Contentful
           context 'reverse the sort-order' do
             it 'returns reverse sort of ordered entries by updatedAt' do
               vcr('entry/search_filter/reverse_order_sys.updatedAt') do
-                reverse_ordered_entries = space.entries.all(order: '-sys.updatedAt')
+                reverse_ordered_entries = client.entries(space.id, 'master').all(order: '-sys.updatedAt')
                 expect(reverse_ordered_entries).to be_kind_of Contentful::Management::Array
                 expect(reverse_ordered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(reverse_ordered_entries.first.sys[:updatedAt] > reverse_ordered_entries.to_a[4].sys[:updatedAt]).to be_truthy
@@ -613,7 +597,7 @@ module Contentful
         context 'Including linked Entries in search results' do
           it 'returns content_type Entry and include 1 level of linked Entries' do
             vcr('entry/search_filter/including_linked_entries') do
-              filtered_entries = space.entries.all('sys.id' => '2Hs5BaU56oUmUIySMQQMUS', include: 2)
+              filtered_entries = client.entries(space.id, 'master').all('sys.id' => '2Hs5BaU56oUmUIySMQQMUS', include: 2)
               expect(filtered_entries).to be_kind_of Contentful::Management::Array
               expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
             end
@@ -624,7 +608,7 @@ module Contentful
           context 'equality operator' do
             it 'returns all Entries with specified ID(IDs are unique and there can only be one)' do
               vcr('entry/search_filter/equality_operator') do
-                filtered_entries = space.entries.all('sys.id' => '2Hs5BaU56oUmUIySMQQMUS')
+                filtered_entries = client.entries(space.id, 'master').all('sys.id' => '2Hs5BaU56oUmUIySMQQMUS')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.first.sys[:id]).to eq '2Hs5BaU56oUmUIySMQQMUS'
@@ -632,7 +616,7 @@ module Contentful
             end
             it 'returns all entries by matching fields.number equal 33' do
               vcr('entry/search_filter/matching_array_fields') do
-                filtered_entries = space.entries.all(content_type: 'category_content_type', 'fields.number' => 33)
+                filtered_entries = client.entries(space.id, 'master').all(content_type: 'category_content_type', 'fields.number' => 33)
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.size).to eq 2
@@ -642,7 +626,7 @@ module Contentful
           context 'inequality operator' do
             it 'returns all entries except entry with id = 2Hs5BaU56oUmUIySMQQMUS' do
               vcr('entry/search_filter/inequality_operator') do
-                filtered_entries = space.entries.all('sys.id[ne]' => '2Hs5BaU56oUmUIySMQQMUS')
+                filtered_entries = client.entries(space.id, 'master').all('sys.id[ne]' => '2Hs5BaU56oUmUIySMQQMUS')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.map(&:id).include?('2Hs5BaU56oUmUIySMQQMUS')).to be_falsey
@@ -654,7 +638,7 @@ module Contentful
           context 'inclusion operator' do
             it 'returns entries with specified IDs' do
               vcr('entry/search_filter/inclusion_operator') do
-                filtered_entries = space.entries.all('sys.id[in]' => '2Hs5BaU56oUmUIySMQQMUS,2X3X7RHVzqsKGAgIEewgaS')
+                filtered_entries = client.entries(space.id, 'master').all('sys.id[in]' => '2Hs5BaU56oUmUIySMQQMUS,2X3X7RHVzqsKGAgIEewgaS')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.map(&:id).include?('2Hs5BaU56oUmUIySMQQMUS')).to be_truthy
@@ -666,7 +650,7 @@ module Contentful
           context 'exclusion operator' do
             it 'returns all entries except with specified IDs' do
               vcr('entry/search_filter/exclusion_operator') do
-                filtered_entries = space.entries.all(content_type: 'category_content_type', 'sys.id[nin]' => '2Hs5BaU56oUmUIySMQQMUS,2X3X7RHVzqsKGAgIEewgaS')
+                filtered_entries = client.entries(space.id, 'master').all(content_type: 'category_content_type', 'sys.id[nin]' => '2Hs5BaU56oUmUIySMQQMUS,2X3X7RHVzqsKGAgIEewgaS')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.map(&:id).include?('2Hs5BaU56oUmUIySMQQMUS')).to be_falsy
@@ -679,7 +663,7 @@ module Contentful
         context 'Full-text Search' do
           it 'returns all entries except with specified IDs' do
             vcr('entry/search_filter/full_search') do
-              filtered_entries = space.entries.all(query: 'find me')
+              filtered_entries = client.entries(space.id, 'master').all(query: 'find me')
               expect(filtered_entries).to be_kind_of Contentful::Management::Array
               expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
               expect(filtered_entries.size).to eq 2
@@ -687,7 +671,7 @@ module Contentful
           end
           it 'returns all entries except with specified IDs' do
             vcr('entry/search_filter/full_search_match_operator') do
-              filtered_entries = space.entries.all(content_type: 'category_content_type', 'fields.description[match]' => 'find')
+              filtered_entries = client.entries(space.id, 'master').all(content_type: 'category_content_type', 'fields.description[match]' => 'find')
               expect(filtered_entries).to be_kind_of Contentful::Management::Array
               expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
               expect(filtered_entries.size).to eq 2
@@ -697,7 +681,7 @@ module Contentful
         context 'Location-based search' do
           it 'returns entries closest to a specific map location and order the results by distance' do
             vcr('entry/search_filter/location_search_near_operator') do
-              filtered_entries = space.entries.all('fields.location[near]' => '23.15758,53.1297098', content_type: '37TpyB8DcQkq0wkY8c4g2g')
+              filtered_entries = client.entries(space.id, 'master').all('fields.location[near]' => '23.15758,53.1297098', content_type: '37TpyB8DcQkq0wkY8c4g2g')
               expect(filtered_entries).to be_kind_of Contentful::Management::Array
               expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
             end
@@ -705,7 +689,7 @@ module Contentful
 
           it 'returns entries with fields.location is inside of the circle' do
             vcr('entry/search_filter/location_search_within_operator') do
-              filtered_entries = space.entries.all('fields.location[within]' => '52,23,300', content_type: '37TpyB8DcQkq0wkY8c4g2g')
+              filtered_entries = client.entries(space.id, 'master').all('fields.location[within]' => '52,23,300', content_type: '37TpyB8DcQkq0wkY8c4g2g')
               expect(filtered_entries).to be_kind_of Contentful::Management::Array
               expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
             end
@@ -716,7 +700,7 @@ module Contentful
           context 'number' do
             it 'returns entries with fields.number less then 20' do
               vcr('entry/search_filter/range_operators_less') do
-                filtered_entries = space.entries.all('fields.number[lte]' => '20', content_type: 'category_content_type')
+                filtered_entries = client.entries(space.id, 'master').all('fields.number[lte]' => '20', content_type: 'category_content_type')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.size).to eq 1
@@ -726,7 +710,7 @@ module Contentful
           context 'date ranges' do
             it 'returns entries have been updated since midnight August 19th 2013' do
               vcr('entry/search_filter/range_operators_greater_than_or_equal') do
-                filtered_entries = space.entries.all('sys.updatedAt[gte]' => '2014-08-19T00:00:00Z')
+                filtered_entries = client.entries(space.id, 'master').all('sys.updatedAt[gte]' => '2014-08-19T00:00:00Z')
                 expect(filtered_entries).to be_kind_of Contentful::Management::Array
                 expect(filtered_entries.first).to be_kind_of Contentful::Management::Entry
                 expect(filtered_entries.size).to eq 11
@@ -740,7 +724,7 @@ module Contentful
         it 'retrieves localized value if it exists' do
           vcr('entry/locales/retrieve_localized') do
             space = client.spaces.find('0agypmo1waov')
-            entry = space.entries.find('5cMXsmSd5So6iggWi268eG')
+            entry = client.entries(space.id, 'master').find('5cMXsmSd5So6iggWi268eG')
             entry.locale = 'de-DE'
 
             expect(entry.fields.count).to eq 2
@@ -751,7 +735,7 @@ module Contentful
         it 'retrieves value of default locale if it has not been localized' do
           vcr('entry/locales/fallback_to_default_locale') do
             space = client.spaces.find('0agypmo1waov')
-            entry = space.entries.find('4epXENbO8wsaOukgqquYcI')
+            entry = client.entries(space.id, 'master').find('4epXENbO8wsaOukgqquYcI')
             entry.locale = 'de-DE'
 
             expect(entry.fields.count).to eq 2
@@ -762,7 +746,9 @@ module Contentful
         it 'sets value for the default locale when using simple assignments' do
           vcr('entry/locales/simple_assignments_use_default_locale') do
             space = client.spaces.find('0agypmo1waov')
-            entry = space.entries.find('4epXENbO8wsaOukgqquYcI')
+            client.content_types(space.id, 'master').all # warm-up cache
+
+            entry = client.entries(space.id, 'master').find('4epXENbO8wsaOukgqquYcI')
 
             entry.yolo = 'changed'
 
@@ -773,7 +759,9 @@ module Contentful
         it 'sets value for the specified locales when using *_with_locales' do
           vcr('entry/locales/simple_assignments_use_specified_locale') do
             space = client.spaces.find('0agypmo1waov')
-            entry = space.entries.find('4epXENbO8wsaOukgqquYcI')
+            client.content_types(space.id, 'master').all # warm-up cache
+
+            entry = client.entries(space.id, 'master').find('4epXENbO8wsaOukgqquYcI')
 
             entry.yolo_with_locales = {'de-DE' => 'changed'}
             entry.locale = 'de-DE'
@@ -840,7 +828,8 @@ module Contentful
         let(:space) { client.spaces.find('wqjq16zu9s8b') }
         it "if a property is nil, it's removed from the request to undefine it in the API" do
           vcr('entry/fallback_undefined') {
-            entry = space.entries.find('6HSlhD1o3eqkyEWWuMQYyU')
+            client.content_types(space.id, 'master').all # warm-up cache
+            entry = client.entries(space.id, 'master').find('6HSlhD1o3eqkyEWWuMQYyU')
 
             expect(entry.name).to eq 'Foo'
             expect(entry.fields('es')[:name]).to eq 'Bar'
@@ -861,13 +850,14 @@ module Contentful
           it 'merges all present locales' do
             vcr('entry/issue_70') {
               space = client.spaces.find('9sh5dtmfyzhj')
+              client.content_types(space.id, 'master').all # warm-up cache
 
-              entry_non_default_locale = space.entries.find('1PdCkb5maYgqsSUCOweseM')
+              entry_non_default_locale = client.entries(space.id, 'master').find('1PdCkb5maYgqsSUCOweseM')
 
               expect(entry_non_default_locale.name_with_locales).to match({"de-DE" => nil, "es" => "Futbolista"})
               expect(entry_non_default_locale.non_localized_with_locales).to match({"de-DE" => "baz", "es" => nil})
 
-              entry_with_all_locales = space.entries.find('1QKkNRf9AEW2wqwWowgscs')
+              entry_with_all_locales = client.entries(space.id, 'master').find('1QKkNRf9AEW2wqwWowgscs')
 
               expect(entry_with_all_locales.name_with_locales).to match({"de-DE" => "Junge", "en-US" => "Boy", "es" => "Chico"})
               expect(entry_with_all_locales.non_localized_with_locales).to match({"de-DE" => "foobar", "en-US" => nil, "es" => nil})
@@ -878,7 +868,7 @@ module Contentful
             vcr('entry/issue_73') {
               begin
                 client.configuration[:default_locale] = 'en-GB'
-                content_type = client.content_types.find('u2viwgfeal0o', 'someType')
+                content_type = client.content_types('u2viwgfeal0o', 'master').find('someType')
                 new_entry = content_type.entries.create(id: 'hello-world')
 
                 new_entry.name = 'Hello World!'
@@ -891,14 +881,14 @@ module Contentful
                 expect(res.is_a?(Contentful::Management::DynamicEntry)).to be_truthy
                 expect(res.value_with_locales).to match('en-GB' => 'hello world', 'es-ES' => 'hola mundo')
               ensure
-                new_entry.destroy
+                #new_entry.destroy
               end
             }
           end
 
           it 'fields_for_query get properly updated when setting a field using _with_locales - #91' do
             vcr('entry/issue_91') {
-              entry = client.entries.find('iv4sic0eru9h', '5GrMLWzfyMs0eKoi4sg2ug')
+              entry = client.entries('iv4sic0eru9h', 'master').find('5GrMLWzfyMs0eKoi4sg2ug')
 
               expect(entry.test_with_locales).to eq('en-US' => 'foo', 'es' => 'bar')
 
@@ -916,7 +906,7 @@ module Contentful
                   vcr('entry/issue_61.1') {
                     begin
                       client.configuration[:default_locale] = 'en-GB'
-                      content_type = client.content_types.find('u2viwgfeal0o', 'someType')
+                      content_type = client.content_types('u2viwgfeal0o', 'master').find('someType')
                       new_entry = content_type.entries.create(id: 'issue61_1', value: 'hello')
 
                       expect(new_entry.value).to eq 'hello'
@@ -926,7 +916,7 @@ module Contentful
                       new_entry.save
                       new_entry.publish
 
-                      expected_entry = subject.find('u2viwgfeal0o', new_entry.id)
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find(new_entry.id)
 
                       expect(expected_entry.value).to eq 'goodbye'
                     ensure
@@ -939,7 +929,7 @@ module Contentful
                   vcr('entry/issue_61.2') {
                     begin
                       client.configuration[:default_locale] = 'en-GB'
-                      content_type = client.content_types.find('u2viwgfeal0o', 'someType')
+                      content_type = client.content_types('u2viwgfeal0o', 'master').find('someType')
                       new_entry = content_type.entries.create(id: 'issue61_2')
 
                       new_entry.value = 'goodbye'
@@ -949,7 +939,7 @@ module Contentful
 
                       expect(new_entry.value).to eq 'goodbye'
 
-                      expected_entry = subject.find('u2viwgfeal0o', new_entry.id)
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find(new_entry.id)
 
                       expect(expected_entry.value).to eq 'goodbye'
                     ensure
@@ -964,12 +954,12 @@ module Contentful
                   vcr('entry/issue_61.3') {
                     begin
                       client.configuration[:default_locale] = 'en-GB'
-                      content_type = client.content_types.find('u2viwgfeal0o', 'someType')
+                      content_type = client.content_types('u2viwgfeal0o', 'master').find('someType')
                       new_entry = content_type.entries.create(id: 'issue61_3', value: 'hello')
 
                       expect(new_entry.value).to eq 'hello'
 
-                      expected_entry = subject.find('u2viwgfeal0o', new_entry.id)
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find(new_entry.id)
 
                       expected_entry.value = 'goodbye'
 
@@ -987,10 +977,10 @@ module Contentful
                   vcr('entry/issue_61.4') {
                     begin
                       client.configuration[:default_locale] = 'en-GB'
-                      content_type = client.content_types.find('u2viwgfeal0o', 'someType')
+                      content_type = client.content_types('u2viwgfeal0o', 'master').find('someType')
                       new_entry = content_type.entries.create(id: 'issue61_4')
 
-                      expected_entry = subject.find('u2viwgfeal0o', new_entry.id)
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find(new_entry.id)
 
                       expected_entry.value = 'goodbye'
 
@@ -1008,13 +998,13 @@ module Contentful
 
             describe 'on an entry created through the ui' do
               describe 'with dynamic_entries' do
-                let!(:client) { vcr('entry/issue_61_spaces') { Client.new(token, dynamic_entries: ['u2viwgfeal0o']) } }
+                let!(:client) { vcr('entry/issue_61_spaces') { Client.new(token, dynamic_entries: {'u2viwgfeal0o' => 'master'}) } }
                 it 'on an already populated field' do
                   vcr('entry/issue_61.5') {
                     begin
                       client.configuration[:default_locale] = 'en-GB'
 
-                      expected_entry = subject.find('u2viwgfeal0o', 'fIpsfQSOd22IsqMQCiG0K')
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find('fIpsfQSOd22IsqMQCiG0K')
 
                       expect(expected_entry.value).to eq 'hello'
 
@@ -1038,7 +1028,7 @@ module Contentful
                     begin
                       client.configuration[:default_locale] = 'en-GB'
 
-                      expected_entry = subject.find('u2viwgfeal0o', '2GmtCwDBcIu4giMgQGIIcq')
+                      expected_entry = client.entries('u2viwgfeal0o', 'master').find('2GmtCwDBcIu4giMgQGIIcq')
 
                       expect(expected_entry.value).to eq nil
 
@@ -1065,7 +1055,7 @@ module Contentful
                   begin
                     client.configuration[:default_locale] = 'en-GB'
 
-                    expected_entry = subject.find('u2viwgfeal0o', 'fIpsfQSOd22IsqMQCiG0K')
+                    expected_entry = client.entries('u2viwgfeal0o', 'master').find('fIpsfQSOd22IsqMQCiG0K')
 
                     expect(expected_entry.value).to eq 'hello'
 
@@ -1089,7 +1079,7 @@ module Contentful
                   begin
                     client.configuration[:default_locale] = 'en-GB'
 
-                    expected_entry = subject.find('u2viwgfeal0o', '2GmtCwDBcIu4giMgQGIIcq')
+                    expected_entry = client.entries('u2viwgfeal0o', 'master').find('2GmtCwDBcIu4giMgQGIIcq')
 
                     expect(expected_entry.value).to eq nil