test updates

Author: untra

spec/fixture/pages/en.menu.md

@@ -2,7 +2,7 @@
 title: Menu
 permalink: the-menu
 lang: en
-lang_id: menu
+page_id: menu
 ---
 
 # the menu

spec/fixture/pages/es.menu.md

@@ -2,7 +2,7 @@
 title: Menu
 permalink: el-menu
 lang: es
-lang_id: menu
+page_id: menu
 ---
 
 # el menú

spec/fixture/pages/fr.menu.md

@@ -2,7 +2,7 @@
 title: Menu
 permalink: le-menu
 lang: fr
-lang_id: menu
+page_id: menu
 ---
 
 # français menu

spec/jekyll/polyglot/hooks/coordinate_spec.rb

@@ -97,7 +97,7 @@
         expect(@site.pages.map { |doc| doc.name }).not_to include('es.samba.md')
       end
 
-      it 'should respect permalinks when lang_id is specified' do
+      it 'should respect permalinks when page_id is specified' do
         @site.process_language 'en'
         expect(@site.pages.select { |doc| doc.name == 'en.about.md' }.first().permalink).to eq('about')
         expect(@site.pages.select { |doc| doc.name == 'en.menu.md' }.first().permalink).to eq('the-menu')

spec/jekyll/polyglot/patches/jekyll/site_spec.rb

@@ -13,7 +13,7 @@
     @config['default_lang'] = @default_lang
     @config['exclude_from_localization'] = @exclude_from_localization
     @parallel_localization = @config['parallel_localization'] || true
-
+    
     @site = Site.new(
       Jekyll.configuration(
         'languages'                 => @langs,
@@ -46,9 +46,9 @@
       expect(@document_url_regex).to_not match 'properties/beachside/foo'
     end
     it 'expect relativized_urls should handle different output' do
-      expected = 'expected'
-      collection = Jekyll::Collection.new(@site, 'test')
-      document = Jekyll::Document.new('about.en.md', site: @site, collection:)
+      expected = "expected"
+      collection = Jekyll::Collection.new(@site, "test")
+      document = Jekyll::Document.new("about.en.md", :site => @site, :collection => collection)
       document.output = expected
       @site.relativize_urls(document, @relative_url_regex)
       expect(document.output).to eq(expected)
@@ -244,25 +244,9 @@
     end
   end
 
-  describe @site do
-    it 'should spawn no more than Etc.nprocessors processes' do
-      forks = 0
-      allow(Etc).to receive(:nprocessors).and_return(2)
-      allow(@site).to receive(:fork) {
-                        forks += 1
-                        fork { sleep 2 }
-                      }
-      thr = Thread.new {
-        sleep 1
-        forks
-      }
-      @site.process
-      expect(thr.value).to eq(Etc.nprocessors)
-      expect(forks).to eq((@langs + [@default_lang]).uniq.length)
-    end
-
+  describe 'site prepare' do
     it 'should copy active_lang to additional variables' do
-      @site.config['lang_vars'] = ['locale', 'язык']
+      @site.config['lang_vars'] = [ 'locale', 'язык' ]
       @site.prepare
       @langs.each do |lang|
         @site.active_lang = lang
@@ -272,6 +256,18 @@
     end
   end
 
+  describe @site do
+    it 'should spawn no more than Etc.nprocessors processes' do
+      forks = 0
+      allow(Etc).to receive(:nprocessors).and_return(2)
+      allow(@site).to receive(:fork) { forks += 1; fork { sleep 2 } }
+      thr = Thread.new { sleep 1; forks }
+      @site.process
+      expect(thr.value).to eq(Etc.nprocessors)
+      expect(forks).to eq((@langs + [@default_lang]).uniq.length)
+    end
+  end
+
   # describe @relativize_urls do
   #   it 'does not raise' do
   #     expect(@relativize_urls(@site.Document.new(), @relative_url_regex)).not_to raise_error