Permalink
Browse files

Move `ginkgo convert` fixtures into more canonical dir

  • Loading branch information...
1 parent e74b6ae commit 2c5f638fa9834cbac82f59c94f8a961122edc3a9 @tjarratt tjarratt committed with Onsi Fakhouri Feb 5, 2014
@@ -9,11 +9,11 @@ type UselessStruct struct {
T *testing.T
}
-var testFunc = func(t *testing.T, arg *string) { }
+var testFunc = func(t *testing.T, arg *string) {}
func TestSomethingImportant(t *testing.T) {
whatever := &UselessStruct{
- T: t,
+ T: t,
ImportantField: "twisty maze of passages",
}
app := "string value"
View
@@ -88,7 +88,7 @@ func init() {
It("gracefully handles existing test suite files", func() {
withTempDir(func(dir string) {
cwd, err := os.Getwd()
- bytes, err := ioutil.ReadFile(filepath.Join(cwd, "convert-goldmasters", "fixtures_suite_test.go"))
+ bytes, err := ioutil.ReadFile(filepath.Join(cwd, "convert_goldmasters", "fixtures_suite_test.go"))
Expect(err).NotTo(HaveOccurred())
err = ioutil.WriteFile(filepath.Join(cwd, "tmp", "tmp_suite_test.go"), bytes, 0600)
Expect(err).NotTo(HaveOccurred())
@@ -107,7 +107,7 @@ func withTempDir(cb func(tempDir string)) {
err = os.MkdirAll(tempDir, os.ModeDir|os.ModeTemporary|os.ModePerm)
Expect(err).NotTo(HaveOccurred())
- copyFixturesIntoTempDir("convert-fixtures", tempDir)
+ copyFixturesIntoTempDir("convert_fixtures", tempDir)
cb(tempDir)
}
@@ -156,7 +156,7 @@ func readGoldMasterNamed(filename string) string {
cwd, err := os.Getwd()
Expect(err).NotTo(HaveOccurred())
- bytes, err := ioutil.ReadFile(filepath.Join(cwd, "convert-goldmasters", filename))
+ bytes, err := ioutil.ReadFile(filepath.Join(cwd, "convert_goldmasters", filename))
Expect(err).NotTo(HaveOccurred())
return string(bytes)
View
@@ -3,7 +3,7 @@ package main
import (
"fmt"
"github.com/onsi/ginkgo/ginkgo/convert"
- "os"
+ "os"
)
func convertPackage() {

0 comments on commit 2c5f638

Please sign in to comment.