1 files changed, 4 insertions, 53 deletions
diff --git a/source/fileInfo_test.go b/source/fileInfo_test.go
index 9390c6247..0c024de18 100644
--- a/source/fileInfo_test.go
+++ b/source/fileInfo_test.go
@@ -15,12 +15,9 @@ package source
 
 import (
 	"path/filepath"
+	"strings"
 	"testing"
 
-	"github.com/gohugoio/hugo/helpers"
-
-	"github.com/gohugoio/hugo/hugofs"
-	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
 )
 
@@ -55,56 +52,10 @@ func TestFileInfo(t *testing.T) {
 
 		}},
 	} {
-		f := s.NewFileInfo(this.base, this.filename, false, nil)
+		path := strings.TrimPrefix(this.filename, this.base)
+		f, err := s.NewFileInfoFrom(path, this.filename)
+		assert.NoError(err)
 		this.assert(f)
 	}
 
 }
-
-func TestFileInfoLanguage(t *testing.T) {
-	assert := require.New(t)
-	langs := map[string]bool{
-		"sv": true,
-		"en": true,
-	}
-
-	m := afero.NewMemMapFs()
-	lfs := hugofs.NewLanguageFs("sv", langs, m)
-	v := newTestConfig()
-
-	fs := hugofs.NewFrom(m, v)
-
-	ps, err := helpers.NewPathSpec(fs, v)
-	assert.NoError(err)
-	s := SourceSpec{SourceFs: lfs, PathSpec: ps}
-	s.Languages = map[string]interface{}{
-		"en": true,
-	}
-
-	err = afero.WriteFile(lfs, "page.md", []byte("abc"), 0777)
-	assert.NoError(err)
-	err = afero.WriteFile(lfs, "page.en.md", []byte("abc"), 0777)
-	assert.NoError(err)
-
-	sv, _ := lfs.Stat("page.md")
-	en, _ := lfs.Stat("page.en.md")
-
-	fiSv := s.NewFileInfo("", "page.md", false, sv)
-	fiEn := s.NewFileInfo("", "page.en.md", false, en)
-
-	assert.Equal("sv", fiSv.Lang())
-	assert.Equal("en", fiEn.Lang())
-
-	// test contentBaseName implementation
-	fi := s.NewFileInfo("", "2018-10-01-contentbasename.md", false, nil)
-	assert.Equal("2018-10-01-contentbasename", fi.ContentBaseName())
-
-	fi = s.NewFileInfo("", "2018-10-01-contentbasename.en.md", false, nil)
-	assert.Equal("2018-10-01-contentbasename", fi.ContentBaseName())
-
-	fi = s.NewFileInfo("", filepath.Join("2018-10-01-contentbasename", "index.en.md"), true, nil)
-	assert.Equal("2018-10-01-contentbasename", fi.ContentBaseName())
-
-	fi = s.NewFileInfo("", filepath.Join("2018-10-01-contentbasename", "_index.en.md"), false, nil)
-	assert.Equal("_index", fi.ContentBaseName())
-}