Skip to content

Commit

Permalink
Merge pull request #80 from christophd/issue/61/run-recursive
Browse files Browse the repository at this point in the history
fix[#61]: Run tests recursive
  • Loading branch information
christophd authored Apr 6, 2020
2 parents 7702a64 + 39a84f9 commit d2c603a
Show file tree
Hide file tree
Showing 19 changed files with 181 additions and 77 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ spec:
help to test for whether an integration is running, is producing some expected output and also whether an HTTP endpoint
returns an expected response.
The example below executes some dummy steps to check that Yaks has been installed correctly.
The example below executes some dummy steps to check that YAKS has been installed correctly.
```
apiVersion: org.citrusframework.yaks/v1alpha1
Expand All @@ -90,8 +90,8 @@ spec:
Then YAKS rocks!
```
Refer to the [Yaks repository](https://github.com/citrusframework/yaks) for more complex examples.
displayName: Yaks Operator
Refer to the [YAKS repository](https://github.com/citrusframework/yaks) for more complex examples.
displayName: YAKS Operator
icon:
- base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   width="120mm"
   height="120mm"
   viewBox="0 0 120 120"
   version="1.1"
   id="svg8"
   inkscape:version="0.92.3 (2405546, 2018-03-11)"
   sodipodi:docname="logo.svg">
  <defs
     id="defs2">
    <linearGradient
       inkscape:collect="always"
       id="linearGradient4549-7">
      <stop
         style="stop-color:#fe8c33;stop-opacity:1"
         offset="0"
         id="stop4545" />
      <stop
         style="stop-color:#da680f;stop-opacity:1"
         offset="1"
         id="stop4547" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4549-7"
       id="radialGradient4553"
       cx="50"
       cy="50"
       fx="50"
       fy="50"
       r="46"
       gradientUnits="userSpaceOnUse"
       gradientTransform="matrix(-0.91495466,0,0,-1.2173913,105.74773,100.86957)" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="1.4"
     inkscape:cx="133.97821"
     inkscape:cy="225.43026"
     inkscape:document-units="mm"
     inkscape:current-layer="layer1"
     showgrid="false"
     inkscape:window-width="1920"
     inkscape:window-height="1016"
     inkscape:window-x="0"
     inkscape:window-y="27"
     inkscape:window-maximized="1" />
  <metadata
     id="metadata5">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(0,-177)">
    <g
       inkscape:groupmode="layer"
       id="layer2"
       inkscape:label="Layer 2"
       transform="translate(0,197)">
      <rect
         style="opacity:0.97999998;fill:url(#radialGradient4553);fill-opacity:1;stroke:none;stroke-width:6.0904479;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
         id="rect844"
         width="112"
         height="112"
         x="4"
         y="-16"
         ry="13.943737" />
      <g
         aria-label="-"
         transform="scale(1.0350215,0.96616351)"
         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:50.35239792px;line-height:1.25;font-family:Meera;-inkscape-font-specification:Meera;letter-spacing:0px;word-spacing:0px;fill:#030340;fill-opacity:1;stroke:none;stroke-width:0.26225206"
         id="text834">
        <path
           d="M 46.584573,35.190732 H 69.24315 c 0.671366,0 1.286784,-0.671365 1.286784,-1.510572 v -3.412773 c 0,-0.839207 -0.447577,-1.286783 -1.286784,-1.286783 H 46.584573 c -0.671366,0 -1.17489,0.503524 -1.17489,1.286783 v 3.412773 c 0,0.951101 0.503524,1.510572 1.17489,1.510572 z"
           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:55.94710541px;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';fill:#030340;fill-opacity:1;stroke-width:0.26225206"
           id="path870" />
      </g>
    </g>
    <g
       aria-label="]"
       transform="matrix(0,0.93824778,-1.0658165,0,0,0)"
       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:86.41755676px;line-height:1.25;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';letter-spacing:0px;word-spacing:0px;fill:#f5ffff;fill-opacity:1;stroke:none;stroke-width:0.45009139"
       id="text817">
      <path
         d="m 220.45118,-89.13354 h -12.96263 c -1.81477,0 -2.85178,1.209846 -2.85178,3.283867 0,2.074022 1.12343,3.283867 2.93819,3.283867 h 6.30849 v 52.455457 h -6.30849 c -1.81476,0 -2.93819,1.296264 -2.93819,3.370285 0,2.074021 1.03701,3.283867 2.85178,3.283867 h 12.96263 c 2.07402,0 3.37029,-1.209846 3.37029,-2.765362 v -60.146619 c 0,-1.555516 -1.29627,-2.765362 -3.37029,-2.765362 z"
         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';fill:#f5ffff;fill-opacity:1;stroke-width:0.45009139"
         id="path864" />
    </g>
    <g
       aria-label=":"
       transform="matrix(0,0.9246848,-1.0814496,0,0,0)"
       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:116.62691498px;line-height:1.25;font-family:Meera;-inkscape-font-specification:Meera;letter-spacing:0px;word-spacing:0px;fill:#030340;fill-opacity:1;stroke:none;stroke-width:0.60743195"
       id="text817-3">
      <path
         d="m 234.67456,-40.436216 c 0,6.181226 4.66508,10.846303 11.77932,10.846303 7.11424,0 12.01257,-4.54845 12.01257,-10.846303 0,-6.181227 -4.7817,-10.613049 -12.01257,-10.613049 -7.11424,0 -11.77932,4.431822 -11.77932,10.613049 z m 0,-30.322998 c 0,6.181226 4.7817,10.846303 11.89595,10.846303 7.11424,0 11.77931,-4.54845 11.77931,-10.846303 0,-6.181227 -4.54844,-10.613049 -11.77931,-10.613049 -7.23087,0 -11.89595,4.431822 -11.89595,10.613049 z"
         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';fill:#030340;fill-opacity:1;stroke-width:0.60743195"
         id="path867" />
    </g>
    <g
       aria-label="&gt;"
       transform="matrix(0,0.89130397,-1.1219517,0,0,0)"
       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:65.48355865px;line-height:1.25;font-family:Meera;-inkscape-font-specification:Meera;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34106016"
       id="text817-32">
      <path
         d="m 285.02376,-62.973355 20.2999,9.495116 -20.2999,9.429633 c -1.57161,0.720319 -2.29193,1.571605 -2.29193,3.077727 0,1.964507 1.17871,3.536112 2.94676,3.536112 0.65484,0 1.30967,-0.261934 2.22644,-0.654836 l 25.53859,-11.918007 c 1.96451,-0.91677 2.94676,-1.83354 2.94676,-3.470629 0,-1.637089 -0.98225,-2.553859 -2.94676,-3.470628 l -25.53859,-11.918008 c -0.91677,-0.392902 -1.5716,-0.654836 -2.22644,-0.654836 -1.76805,0 -2.94676,1.506122 -2.94676,3.470629 0,1.506122 0.72032,2.357408 2.29193,3.077727 z"
         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Courier 10 Pitch';-inkscape-font-specification:'Courier 10 Pitch Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.34106016"
         id="path873" />
    </g>
  </g>
</svg>

mediatype: image/svg+xml
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/extension.feature
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ Feature: extension

Scenario: print extended slogan
Given YAKS does Cloud-Native BDD testing
Then Yaks can be extended!
Then YAKS can be extended!
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ public class SomeOtherSteps {
@CitrusResource
private TestRunner runner;

@Then("^Yaks can be extended!$")
@Then("^YAKS can be extended!$")
public void yaksCanBeExtended() {
runner.echo("Yaks can be extended!");
runner.echo("YAKS can be extended!");
}

}
4 changes: 4 additions & 0 deletions examples/namespace/namespace.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Feature: Run test in temp namespace

Scenario: print message
Given print 'Hello from temporary namespace!'
4 changes: 4 additions & 0 deletions examples/namespace/yaks-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
config:
namespace:
temporary: true
autoRemove: true
4 changes: 4 additions & 0 deletions examples/test-group/sub-group/test3.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Feature: test3

Scenario: print message
Given print 'Hello from Test 3!'
4 changes: 4 additions & 0 deletions examples/test-group/sub-group/yaks-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
config:
namespace:
temporary: true
autoRemove: true
4 changes: 4 additions & 0 deletions examples/test-group/test1.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Feature: test1

Scenario: print message
Given print 'Hello from Test 1!'
4 changes: 4 additions & 0 deletions examples/test-group/test2.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Feature: test2

Scenario: print message
Given print 'Hello from Test 2!'
4 changes: 4 additions & 0 deletions examples/test-group/yaks-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
config:
namespace:
temporary: false
autoRemove: true
2 changes: 1 addition & 1 deletion hack/operatorsource.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# OperatorSource used to publish the Yaks operator directly on OperatorHub
# OperatorSource used to publish the YAKS operator directly on OperatorHub
apiVersion: operators.coreos.com/v1
kind: OperatorSource
metadata:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Feature: Test reporter

Scenario: Success test
Given echo "Yaks rocks!"
Given echo "YAKS rocks!"
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Feature: Standard steps

Scenario: print log messages
Given print 'BDD testing on Kubernetes with Yaks'
Then print 'Yaks rocks!'
Given print 'BDD testing on Kubernetes with YAKS'
Then print 'YAKS rocks!'
16 changes: 9 additions & 7 deletions pkg/cmd/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,32 @@ import (
"gopkg.in/yaml.v2"
)

type TestConfig struct {
type RunConfig struct {
Config Config `yaml:"config"`
}

type Config struct {
Recursive bool `yaml:"recursive"`
Namespace NamespaceConfig
}

type NamespaceConfig struct {
Temporary bool `yaml:"temporary"`
AutoRemove bool `yaml:"autoremove"`
Name string `yaml:"name"`
Temporary bool `yaml:"temporary"`
AutoRemove bool `yaml:"autoremove"`
}

func newWithDefaults() *TestConfig {
func newWithDefaults() *RunConfig {
ns := NamespaceConfig{
AutoRemove: true,
Temporary: false,
}

var config = Config{Namespace: ns}
return &TestConfig{Config: config}
var config = Config{Recursive: true, Namespace: ns}
return &RunConfig{Config: config}
}

func LoadConfig(file string) (*TestConfig, error) {
func LoadConfig(file string) (*RunConfig, error) {
config := newWithDefaults()
data, err := ioutil.ReadFile(file)
if err != nil && os.IsNotExist(err) {
Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ func newCmdInstall(rootCmdOptions *RootCmdOptions) *cobra.Command {
cmd := cobra.Command{
PersistentPreRunE: impl.preRun,
Use: "install",
Short: "Install Yaks on a Kubernetes cluster",
Long: `Installs Yaks on a Kubernetes or OpenShift cluster.`,
Short: "Install YAKS on a Kubernetes cluster",
Long: `Installs YAKS on a Kubernetes or OpenShift cluster.`,
RunE: impl.install,
}

Expand Down Expand Up @@ -71,7 +71,7 @@ func (o *installCmdOptions) install(_ *cobra.Command, _ []string) error {
}

if o.clusterSetupOnly {
fmt.Println("Yaks cluster setup completed successfully")
fmt.Println("YAKS cluster setup completed successfully")
} else {
c, err := o.GetCmdClient()
if err != nil {
Expand All @@ -88,9 +88,9 @@ func (o *installCmdOptions) install(_ *cobra.Command, _ []string) error {
if err != nil {
return err
}
fmt.Println("Yaks setup completed successfully")
fmt.Println("YAKS setup completed successfully")
} else {
fmt.Println("Yaks operator installation skipped")
fmt.Println("YAKS operator installation skipped")
}
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/operator.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ func newCmdOperator(rootCmdOptions *RootCmdOptions) *cobra.Command {
}
cmd := cobra.Command{
Use: "operator",
Short: "Run the Yaks operator",
Long: `Run the Yaks operator locally.`,
Short: "Run the YAKS operator",
Long: `Run the YAKS operator locally.`,
Run: impl.run,
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/spf13/cobra"
)

const yaksCommandLongDescription = `Yaks is Yet Another Kamel Subproject.
const yaksCommandLongDescription = `YAKS is Yet Another Kubernetes Service.
`

// RootCmdOptions --
Expand All @@ -43,7 +43,7 @@ func NewYaksCommand(ctx context.Context) (*cobra.Command, error) {
}
var cmd = cobra.Command{
Use: "yaks",
Short: "Yaks is a awesome client tool for running tests natively on Kubernetes",
Short: "YAKS is a awesome client tool for running tests natively on Kubernetes",
Long: yaksCommandLongDescription,
}

Expand Down
Loading

0 comments on commit d2c603a

Please sign in to comment.