Skip to content

fix: dart mock generation order #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2021
Merged

fix: dart mock generation order #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.idea/
.DS_Store
.vscode/
/client/test/**/*_test.mocks.dart
/client/test/**/*.mocks.dart
.devcontainer/
8 changes: 5 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ else ifeq ($(UNAME), Windows)
PROTOC_FILE := $(PROTOC_ZIP_WINDOWS)
endif

DART_MOCK_FILES := $(shell find client -name "*.mocks.dart" -type f)
# Mock 이 필요한 파일
DART_MOCK_SRCS := $(shell find client -name "*_with_mocks.dart" -type f)
DART_MOCK_TARGETS := $(DART_MOCK_SRCS:%_with_mocks.dart=%_with_mocks.mocks.dart)

.PHONY: install
install:
Expand Down Expand Up @@ -60,10 +62,10 @@ gen.dart:
test: test.go test.dart

.PHONY: test.dart
test.dart: $(DART_MOCK_FILES)
test.dart: $(DART_MOCK_TARGETS)
cd client && flutter analyze && flutter test

$(DART_MOCK_FILES): $(DART_MOCK_FILES:.mocks.dart=.dart)
$(DART_MOCK_TARGETS): $(DART_MOCK_SRCS)
cd client && flutter pub run build_runner build

.PHONY: test.dart-e2e
Expand Down
2 changes: 1 addition & 1 deletion client/test/screens/main_screen_test.dart → .../screens/main_screen_test_with_mocks.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:pr12er/screens/main_screen.dart';
import 'package:pr12er/service.dart';
import 'package:provider/provider.dart';

import 'main_screen_test.mocks.dart';
import 'main_screen_test_with_mocks.mocks.dart';

Widget setup(Widget widget, GrpcClient grpcClient) {
return Provider(
Expand Down