Merge branch 'master' into forkMaster

This commit is contained in:
Raphael Tiersch 2017-07-31 16:02:47 +02:00
commit 832cc94e04
3 changed files with 13 additions and 5 deletions

View file

@ -22,9 +22,13 @@ func TestGoldenAddCmd(t *testing.T) {
// Initialize the project at first.
initializeProject(project)
defer os.RemoveAll(project.AbsPath())
defer viper.Set("year", nil)
viper.Set("year", 2017) // For reproducible builds
viper.Set("author", "NAME HERE <EMAIL ADDRESS>")
viper.Set("license", "apache")
viper.Set("year", 2017)
defer viper.Set("author", nil)
defer viper.Set("license", nil)
defer viper.Set("year", nil)
// Then add the "test" command.
cmdName := "test"

View file

@ -18,9 +18,13 @@ func TestGoldenInitCmd(t *testing.T) {
projectName := "github.com/spf13/testproject"
project := NewProject(projectName)
defer os.RemoveAll(project.AbsPath())
defer viper.Set("year", nil)
viper.Set("year", 2017) // For reproducible builds
viper.Set("author", "NAME HERE <EMAIL ADDRESS>")
viper.Set("license", "apache")
viper.Set("year", 2017)
defer viper.Set("author", nil)
defer viper.Set("license", nil)
defer viper.Set("year", nil)
os.Args = []string{"cobra", "init", projectName}
if err := rootCmd.Execute(); err != nil {

View file

@ -78,7 +78,7 @@ func getLicense() License {
func copyrightLine() string {
author := viper.GetString("author")
year := viper.GetString("year") // For reproducible builds
year := viper.GetString("year") // For tests.
if year == "" {
year = time.Now().Format("2006")
}