ci: Pass tests under macOS

.github/workflows/ci.yml

@@ -56,19 +56,19 @@ jobs:
       - run: docker --version
       - run: make test-pure-on-nix FISH_VERSION=${{ matrix.version.fish }}
 
-  # test-macos:
-  #   name: Test on fish on MacOS
-  #   runs-on: macos-latest
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Install Fish
-  #       run: brew install fish
-  #     - name: Install Fisher > Fishtape > Pure
-  #       run: curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher jorgebucaran/fishtape ./
-  #       shell: fish {0}
-  #     - name: Test Pure
-  #       run: fishtape tests/*.test.fish
-  #       shell: fish {0}
+  test-macos:
+    name: Test on fish on MacOS
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Fish
+        run: brew install fish
+      - name: Install Fisher > Fishtape > Pure
+        run: curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher jorgebucaran/fishtape ./
+        shell: fish {0}
+      - name: Test Pure
+        run: fishtape tests/*.test.fish
+        shell: fish {0}
 
   bump-version: # Bump when on master
     needs: [test-container]

functions/_pure_check_for_new_release.fish

@@ -20,5 +20,5 @@ function pure_get_latest_release_version \
     curl \
         --silent \
         "https://api.github.com/repos/$user_repo/releases/latest" \
-    | string match --regex  '"tag_name": "\K.*?(?=")'
+        | string match --regex '"tag_name": "\K.*?(?=")'
 end

tests/_pure_check_for_new_release.test.fish

@@ -20,6 +20,7 @@ before_each
 before_each
 @test "_pure_check_for_new_release: nothing when same as latest" (
     set --universal pure_check_for_new_release true
+    set --erase pure_version
     set --universal pure_version 0.0.1
     function curl; echo '"tag_name": "v0.0.1",'; end # mock
 
@@ -29,6 +30,7 @@ before_each
 before_each
 @test "_pure_check_for_new_release: show fisher command to install when enable" (
     set --universal pure_check_for_new_release true
+    set --erase pure_version
     set --universal pure_version 0.0.1
     function curl; echo '"tag_name": "v9.9.9",'; end # mock
 

tests/_pure_is_inside_container.test.fish

@@ -53,12 +53,25 @@ end
     echo $called
 ) = once
 
-cleanup_spy
-@test "_pure_is_inside_container: true for Github Action" (
-    set --universal pure_enable_container_detection true
+if test (uname -s) != Darwin
+    cleanup_spy
+    @test "_pure_is_inside_container: true for Github Action on Ubuntu" (
+        set --universal pure_enable_container_detection true
 
-    _pure_is_inside_container
-) $status -eq $SUCCESS
+        _pure_is_inside_container
+    ) $status -eq $SUCCESS
+    end
+end
+
+if test (uname -s) = Darwin
+    cleanup_spy
+    @test "_pure_is_inside_container: false for Github Action on MacOS" (
+        set --universal pure_enable_container_detection true
+
+	    _pure_is_inside_container
+    ) $status -eq $FAILURE
+    end
+end
 
 @test "_pure_is_inside_container: detect with $container variable" (
     set --universal pure_enable_container_detection true

tests/_pure_print_prompt_rows.test.fish

@@ -19,14 +19,14 @@ before_each
 @test "_pure_print_prompt_rows: end with newline by default" (
     set --universal pure_enable_single_line_prompt false
 
-    _pure_print_prompt_rows | wc -l
+    _pure_print_prompt_rows | wc -l | tr -d ' '
 ) = $IS_PRESENT
 
 before_each
 @test "_pure_print_prompt_rows: end WITHOUT newline when compact-prompt is enable" (
     set --universal pure_enable_single_line_prompt true
 
-    _pure_print_prompt_rows | wc -l
+    _pure_print_prompt_rows | wc -l | tr -d ' '
 ) = $NONE
 
 

tests/_pure_prompt_new_line.test.fish

@@ -22,21 +22,21 @@ end
     set --universal pure_enable_single_line_prompt false
     set _pure_fresh_session false
 
-    _pure_prompt_new_line | wc -l
+    _pure_prompt_new_line | wc -l | tr -d ' '
 ) -eq $IS_PRESENT
 
 @test "_pure_prompt_new_line: print prompt without newline for new session" (
     set --universal pure_enable_single_line_prompt false
     set _pure_fresh_session true
 
-    _pure_prompt_new_line | wc -l
+    _pure_prompt_new_line | wc -l | tr -d ' '
 ) = $NONE
 
 @test "_pure_prompt_new_line: print prompt without newline when single line prompt is enabled" (
     set _pure_fresh_session false
     set --universal pure_enable_single_line_prompt true
 
-    _pure_prompt_new_line | wc -l
+    _pure_prompt_new_line | wc -l | tr -d ' '
 ) = $NONE
 
 before_each

tests/fish_prompt.test.fish

@@ -61,13 +61,13 @@ before_all
 
 @test "fish_prompt: use 2-lines prompt by default" (
     set --universal pure_enable_single_line_prompt false
-    fish_prompt | wc -l
+    fish_prompt | wc -l | tr -d ' '
 ) = 2
 
 @test "fish_prompt: use 1-line compact-prompt" (
     set --universal pure_enable_single_line_prompt true
 
-    fish_prompt | wc -l
+    fish_prompt | wc -l | tr -d ' '
 ) = 1
 
 after_all