Merge context package into the main package

README.md

@@ -34,13 +34,13 @@ Feature: math operations
 Add a new test `main_test.go`:
 
 ```go
-func add(t gobdd.StepTest, ctx context.Context, var1, var2 int) context.Context{
+func add(t gobdd.StepTest, ctx gobdd.Context, var1, var2 int) {
 	res := var1 + var2
 	ctx.Set("sumRes", res)
 	return ctx
 }
 
-func check(t gobdd.StepTest, ctx context.Context, sum int) context.Context{
+func check(t gobdd.StepTest, ctx gobdd.Context, sum int) {
 	received, err := ctx.GetInt("sumRes")
 	if err != nil {
 		t.Error(err)

context.go

@@ -0,0 +1,72 @@
+package gobdd
+
+import (
+	"fmt"
+)
+
+// Holds data from previously executed steps
+type Context struct {
+	values map[interface{}]interface{}
+}
+
+// Creates a new (empty) context struct
+func NewContext() Context {
+	return Context{
+		values: map[interface{}]interface{}{},
+	}
+}
+
+// Clone creates a copy of the context
+func (ctx Context) Clone() Context {
+	c := Context{
+		values: map[interface{}]interface{}{},
+	}
+
+	for k, v := range ctx.values {
+		c.Set(k, v)
+	}
+
+	return c
+}
+
+// Sets the value under the key
+func (ctx Context) Set(key interface{}, value interface{}) {
+	ctx.values[key] = value
+}
+
+// Returns the data under the key.
+// If couldn't find anything but the default value is provided, returns the default value.
+// Otherwise, it returns an error.
+func (ctx Context) Get(key interface{}, defaultValue ...interface{}) (interface{}, error) {
+	if _, ok := ctx.values[key]; !ok {
+		if len(defaultValue) == 1 {
+			return defaultValue[0], nil
+		}
+
+		return nil, fmt.Errorf("the key %+v does not exist", key)
+	}
+
+	return ctx.values[key], nil
+}
+
+// It is a shortcut for getting the value already casted as error.
+func (ctx Context) GetError(key interface{}, defaultValue ...error) (error, error) {
+	if _, ok := ctx.values[key]; !ok {
+		if len(defaultValue) == 1 {
+			return defaultValue[0], nil
+		}
+
+		return nil, fmt.Errorf("the key %+v does not exist", key)
+	}
+
+	if ctx.values[key] == nil {
+		return nil, nil
+	}
+
+	value, ok := ctx.values[key].(error)
+	if !ok {
+		return nil, fmt.Errorf("the expected value is not error  (%T)", key)
+	}
+
+	return value, nil
+}

context/context.go

@@ -1,72 +1,15 @@
 package context
 
 import (
-	"fmt"
+	"github.com/go-bdd/gobdd"
 )
 
 // Holds data from previously executed steps
-type Context struct {
-	values map[interface{}]interface{}
-}
+// Deprecated: use gobdd.Context instead.
+type Context = gobdd.Context
 
 // Creates a new (empty) context struct
+// Deprecated: use gobdd.NewContext instead.
 func New() Context {
-	return Context{
-		values: map[interface{}]interface{}{},
-	}
-}
-
-// Clone creates a copy of the context
-func (ctx Context) Clone() Context {
-	c := Context{
-		values: map[interface{}]interface{}{},
-	}
-
-	for k, v := range ctx.values {
-		c.Set(k, v)
-	}
-
-	return c
-}
-
-// Sets the value under the key
-func (ctx Context) Set(key interface{}, value interface{}) {
-	ctx.values[key] = value
-}
-
-// Returns the data under the key.
-// If couldn't find anything but the default value is provided, returns the default value.
-// Otherwise, it returns an error.
-func (ctx Context) Get(key interface{}, defaultValue ...interface{}) (interface{}, error) {
-	if _, ok := ctx.values[key]; !ok {
-		if len(defaultValue) == 1 {
-			return defaultValue[0], nil
-		}
-
-		return nil, fmt.Errorf("the key %+v does not exist", key)
-	}
-
-	return ctx.values[key], nil
-}
-
-// It is a shortcut for getting the value already casted as error.
-func (ctx Context) GetError(key interface{}, defaultValue ...error) (error, error) {
-	if _, ok := ctx.values[key]; !ok {
-		if len(defaultValue) == 1 {
-			return defaultValue[0], nil
-		}
-
-		return nil, fmt.Errorf("the key %+v does not exist", key)
-	}
-
-	if ctx.values[key] == nil {
-		return nil, nil
-	}
-
-	value, ok := ctx.values[key].(error)
-	if !ok {
-		return nil, fmt.Errorf("the expected value is not error  (%T)", key)
-	}
-
-	return value, nil
+	return gobdd.NewContext()
 }