Merge pull request #587 from TypedDevs/fix/586-data-providers-function-keyword-requirement

fix(helpers): make function keyword optional for data provider tests

Author: Chemaclass

CHANGELOG.md

@@ -20,6 +20,10 @@
     - Can also be set via `BASHUNIT_NO_PROGRESS=true` environment variable
 
 ### Fixed
+- Data providers now work without the `function` keyword on test functions (Issue #586)
+    - Previously, data provider detection required at least the first test using a provider to have the `function` keyword
+    - Now all test functions work consistently regardless of whether they use the `function` keyword
+    - Fixes regex in `bashunit::helper::get_provider_data()` to make the `function` keyword optional
 - Self-test `tests/acceptance/install_test.sh` now passes when no network tools are available (Issue #582)
     - Tests skip gracefully with `BASHUNIT_NO_NETWORK=true` or in sandboxed environments
 

src/helpers.sh

@@ -262,7 +262,7 @@ function bashunit::helper::get_provider_data() {
   local data_provider_function
   data_provider_function=$(
     # shellcheck disable=SC1087
-    grep -B 2 -E "function[[:space:]]+$function_name[[:space:]]*\(\)" "$script" 2>/dev/null | \
+    grep -B 2 -E "(function[[:space:]]+)?$function_name[[:space:]]*\(\)" "$script" 2>/dev/null | \
     sed -nE 's/^[[:space:]]*# *@?data_provider[[:space:]]+//p'
   )
 

tests/functional/provider_without_function_keyword_test.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Test case for issue #586: data providers should work without the function keyword
+# All test functions and providers defined WITHOUT the function keyword
+
+# @data_provider provide_test_data_1
+test_should_work_without_function_keyword_1() {
+  local input="$1"
+  local expected="$2"
+
+  assert_equals "$expected" "$input"
+}
+
+provide_test_data_1() {
+  echo "value1" "value1"
+  echo "value2" "value2"
+}
+
+# @data_provider provide_test_data_2
+test_should_work_without_function_keyword_2() {
+  local input="$1"
+
+  assert_not_equals "invalid" "$input"
+}
+
+provide_test_data_2() {
+  echo "first"
+  echo "second"
+}
+
+# @data_provider provide_test_data_3
+test_should_work_without_function_keyword_3() {
+  local value="$1"
+
+  assert_matches "^test" "$value"
+}
+
+provide_test_data_3() {
+  bashunit::data_set "test1"
+  bashunit::data_set "test2"
+  bashunit::data_set "test3"
+}