output: Add output type

2 files changed, 44 insertions, 6 deletions

diff --git a/media/type.go b/media/mediaType.go
index 701f8f4e1..4663a274d 100644
--- a/media/type.go
+++ b/media/mediaType.go
@@ -35,18 +35,18 @@ type Type struct {
 // default media types. These can be overridden by the user in the configuration,
 // by defining a media type with the same Key.
 func (m Type) Key() string {
-	if m.Suffix != "" {
-		return fmt.Sprintf("%s/%s+%s", m.Type, m.SubType, m.Suffix)
-	}
 	return fmt.Sprintf("%s/%s", m.Type, m.SubType)
 }
 
 func (m Type) String() string {
-	return m.Key()
+	if m.Suffix != "" {
+		return fmt.Sprintf("%s/%s+%s", m.Type, m.SubType, m.Suffix)
+	}
+	return fmt.Sprintf("%s/%s", m.Type, m.SubType)
 }
 
 var (
-	HtmlType = Type{"text", "html", "html"}
+	HTMLType = Type{"text", "html", "html"}
 	RSSType  = Type{"application", "rss", "xml"}
 )
 
@@ -54,8 +54,9 @@ var (
 // These can be ovverriden, and more added if needed, in the Hugo configuration file.
 // The final media type set set will also be added as extensions to mime so
 // they will be recognised by the built-in server in Hugo.
+// TODO(bep) output remove
 var DefaultMediaTypes = Types{
-	HtmlType,
+	HTMLType,
 	RSSType,
 
 	// TODO(bep) output
diff --git a/media/mediaType_test.go b/media/mediaType_test.go
new file mode 100644
index 000000000..64a0a6567
--- /dev/null
+++ b/media/mediaType_test.go
@@ -0,0 +1,37 @@
+// Copyright 2017-present The Hugo Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package media
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestDefaultTypes(t *testing.T) {
+	require.Equal(t, "text", HTMLType.Type)
+	require.Equal(t, "html", HTMLType.SubType)
+	require.Equal(t, "html", HTMLType.Suffix)
+
+	require.Equal(t, "text/html", HTMLType.Key())
+	require.Equal(t, "text/html+html", HTMLType.String())
+
+	require.Equal(t, "application", RSSType.Type)
+	require.Equal(t, "rss", RSSType.SubType)
+	require.Equal(t, "xml", RSSType.Suffix)
+
+	require.Equal(t, "application/rss", RSSType.Key())
+	require.Equal(t, "application/rss+xml", RSSType.String())
+
+}