fix: all the tests passing

Author: michele-sciabarra

Taskfile.yml

@@ -36,12 +36,12 @@ tasks:
     - echo "{{.BASEVER}}-$(date +%y%m%d%H%M).{{.VARIANT}}" >version.txt
     - echo "{{.BASEVER}}" >branch.txt
     - git add version.txt branch.txt
-    - git commit -m "version files"
+    - git commit -m "$(cat version.txt)"
     - git tag -f "v$(cat version.txt)"
 
 
   trigger:
-    desc: create tag,  and push triggering a build
+    desc: create tag and push triggering a build
     prompt: did you commit everyting?
     cmds:
     - git diff --exit-code
@@ -56,7 +56,7 @@ tasks:
     desc: build ops locally
     cmds:
       - echo building {{.VERSION}}
-      - go build  {{.DEBUG}} cmd/ops/ops.go
+      - go build  {{.DEBUG}} ./cmd/ops/
     sources:
       - "*.go"
       - "*/*.go"

cmd/ops/ops.go

@@ -191,7 +191,7 @@ func locateOpsRoot(cur string) (string, error) {
 		return olaris, nil
 	}
 
-	return "", fmt.Errorf("we cannot find opsfiles, download them with ops -update")
+	return "", fmt.Errorf("cannot find opsfiles, download them with ops -update")
 }
 
 // locateOpsRootSearch search for `opsfiles.yml`

nuv.go ops.gonuv.go renamed to ops.go

@@ -40,8 +40,7 @@ func Example_locate() {
 
 // TODO: undestand why it fails when executed with others
 // it works executed alone
-func Failing_Example_download() {
-	pr(1)
+func Example_download() {
 	_ = os.Chdir(workDir)
 	OpsBranch = "0.1.0"
 	opsdir, _ := homedir.Expand("~/.ops")
@@ -53,7 +52,6 @@ func Failing_Example_download() {
 	dir, err = locateOpsRoot(".")
 	pr(2, err, nhpath(dir))
 	// Output:
-	// 1
 	// Cloning tasks...
 	// Tasks downloaded successfully
 	// 1 <nil> /home/.ops/0.1.0/olaris
@@ -73,7 +71,7 @@ func Example_locate_root() {
 	dir, err := locateOpsRoot("tests")
 	pr(2, err, npath(dir))
 	// Output:
-	// 1 we cannot find opsfiles, download them with ops -update
+	// 1 cannot find opsfiles, download them with ops -update
 	// 2 <nil> /work/tests/olaris
 }
 

nuv_test.go ops_test.gonuv_test.go renamed to ops_test.go

@@ -57,7 +57,7 @@ setup() {
     export OPS_APIHOST=localhost
     export OPS_PASSWORD=1234
     run ops -login
-    assert_line "Logging in as opsolaris to localhost"
+    assert_line "Logging in as nuvolaris to localhost"
 }
 
 @test "ops -login with OPS_APIHOST and OPS_USER env" {

prepare.go

@@ -101,7 +101,7 @@ setup() {
 }
 
 @test "ops -plugin with correct plugin repo" {
-    run ops -plugin https://github.com/giusdp/olaris-test.git
+    run ops -plugin https://github.com/sciabarracom/olaris-test.git
     assert_success
 
     run ops

prepare_test.go

@@ -19,21 +19,24 @@ setup() {
     load 'test_helper/bats-support/load'
     load 'test_helper/bats-assert/load'
     export NO_COLOR=1
+    rm -rf ~/.ops
+    cd ..
 }
 
-@test "ops -update" {
-    run rm -rf ~/.ops
+@test "ops -update and versions" {
     run ops -update
     assert_success
     assert_line "Tasks downloaded successfully"
-    assert_line "ensuring prerequisite coreutils"
-}
+    assert_line --partial "ensuring prerequisite coreutils"
 
-@test "ops -update with old version warns" {
     OPS_VERSION=0.0.0 run ops -update
     assert_line --partial "Your ops version (0.0.0) is older than the required version"
     assert_line "Trying to update ops..."
-    #assert_success
+    assert_success
+
+    OPS_VERSION=10.2.3 run ops -update
+    assert_line "Tasks are already up to date!"
+    assert_success
 }
 
 @test "ops -update with bad version" {
@@ -42,16 +45,8 @@ setup() {
     assert_success
 }
 
-@test "ops -update with newer version" {
-    OPS_VERSION=10.2.3 run ops -update
-    assert_line "Tasks are already up to date!"
-    assert_success
-}
-
 @test "ops -update on branch" {
-    run rm -rf ~/.ops
-    export OPS_BRANCH=0.1.0
-    run ops -update
+    OPS_BRANCH=main run ops -update
     assert_line "Tasks downloaded successfully"
     assert_success
 }

tests/login.bats

@@ -21,8 +21,9 @@ setup() {
     export NO_COLOR=1
     export OPS_BRANCH="$(cat ../branch.txt)"
     rm -rf ~/.ops
-    run ops -update
+    ops -update
     cd ~/.ops/$OPS_BRANCH/olaris
+    ops -info
 }
 
 @test "ops -update on olaris with old commit updates correctly" {
@@ -31,7 +32,7 @@ setup() {
     assert_line --partial "Your branch is behind"
 
     run ops -update
-    assert_line "Tasks updated successfully"
+    assert_line --partial "Tasks updated successfully"
     assert_success
 
     run git status