Skip to content

Commit f843b5b

Browse files
committed
🔧 [macos] fixup
1 parent b828462 commit f843b5b

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

README.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<a href="http://www.boost.org/LICENSE_1_0.txt" target="_blank">![Boost Licence](http://img.shields.io/badge/license-boost-blue.svg)</a>
22
<a href="https://github.com/cpp-testing/GUnit/releases" target="_blank">![Version](https://badge.fury.io/gh/cpp-testing%2FGUnit.svg)</a>
3-
<a href="https://travis-ci.org/cpp-testing/GUnit" target="_blank">![Build Status](https://img.shields.io/travis/cpp-testing/GUnit/master.svg?label=linux/osx)</a>
3+
<a href="https://github.com/cpp-testing/GUnit/actions/workflows/linux.yml" target="_blank">![Build](https://github.com/cpp-testing/GUnit/actions/workflows/linux.yml/badge.svg
4+
<a href="https://github.com/cpp-testing/GUnit/actions/workflows/macos.yml" target="_blank">![Build](https://github.com/cpp-testing/GUnit/actions/workflows/macos.yml/badge.svg
5+
<a href="https://github.com/cpp-testing/GUnit/actions/workflows/windows.yml" target="_blank">![Build](https://github.com/cpp-testing/GUnit/actions/workflows/windows.yml/badge.svg
46
<a href="https://codecov.io/gh/cpp-testing/GUnit" target="_blank">![Coveralls](https://codecov.io/gh/cpp-testing/GUnit/branch/master/graph/badge.svg)</a>
57
<a href="http://github.com/cpp-testing/GUnit/issues" target="_blank">![Github Issues](https://img.shields.io/github/issues/cpp-testing/GUnit.svg)</a>
68

@@ -210,7 +212,7 @@
210212
* `GUnit.GSteps` - Behaviour Driven Development
211213
* Support for - [Gherkin](https://github.com/cucumber/cucumber/wiki/Gherkin) style - BDD tests
212214
* `GUnit.GAssert` - Google.Test assertions without postfixes
213-
* Simple/consised interface - `EXPECT(true); EXPECT(.0 > 2.0); ASSERT(11 != 42), ...`
215+
* Simple/consised interface - `EXPECT(true); EXPECT(.0 > 2.0); ASSERT(11 != 42), ...`
214216
* No more EXPECT_EQ/EXPECT_GT/...
215217
* No more confusing error messages depending on expected, given parameters
216218
* No more bugs due to using the wrong EXPECT for floating point numbers (EXPECT_DOUBLE_EQ) and/or strings
@@ -260,7 +262,7 @@
260262
Note: This sections needs updates, when writing the gherkin-cpp CMake integration I used add_subdirectory:
261263
* Add include paths
262264
* `-I GUnit_install_dir/include`
263-
* Link with `libgherkin-cpp.{a, so}` Note: I wasn't able to nest the fmem/gherkin into libghekin-cpp, so two more libs to add: fmem/gherkin!
265+
* Link with `libgherkin-cpp.{a, so}` Note: I wasn't able to nest the fmem/gherkin into libghekin-cpp, so two more libs to add: fmem/gherkin!
264266
* `-L gherkin-cpp`
265267
* `-L fmem`
266268
* `-L gherkin`

include/GUnit/GSteps.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ class Steps : public ::testing::EmptyTestEventListener {
301301
public:
302302
Steps() {
303303
const auto scenario = std::getenv("SCENARIO");
304-
304+
305305
if (scenario) {
306306
::testing::UnitTest::GetInstance()->listeners().Append(this);
307307
// If the output is set, then add a report to the features holder
308308
const auto output = std::getenv("OUTPUT_CUCUMBER_JSON");
309-
309+
310310
if (output) {
311311
std::string path = std::string(output) + std::string(std::getenv("TEST_NAME"));
312312
std::cout << path << std::endl;
@@ -577,10 +577,10 @@ class Steps : public ::testing::EmptyTestEventListener {
577577
for (const auto& exp_step : pickle_steps_) {
578578
if (exp_step["text"] == expectedStep.second->name) {
579579
if (exp_step["text"] == expectedStep.second->name) {
580-
const auto line = exp_step["locations"].back()["line"].get<std::size_t>();
580+
const auto line = exp_step["locations"].back()["line"].template get<std::size_t>();
581581
if (line > line_) {
582582
expected_step = exp_step;
583-
tmp_line = exp_step["locations"].back()["line"].get<std::size_t>();
583+
tmp_line = exp_step["locations"].back()["line"].template get<std::size_t>();
584584
break;
585585
}
586586
}

0 commit comments

Comments
 (0)