-
-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Add page to configure draft sources #2962
base: master
Are you sure you want to change the base?
Conversation
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
615d115
to
0bf8bbd
Compare
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
@marksvc Could you resolve merge conflicts, since they're on changes you made? |
d185c4b
to
db36b13
Compare
@Nateowami You might already have a great conflict resolution tool. If not, FYI that kdiff3 automatically solves a number of conflicts that git doesn't already automatically solve. kdiff3's interface is a learning curve, but it's worth it once you get comfortable with the tool. I still had to think about what was going on in the remaining conflicts (and it makes sense that you asked me to resolve it since I worked on it), but it is a nice way to address conflicts. And a good time to mention the useful tool :) |
...e/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.spec.ts
Fixed
Show fixed
Hide fixed
...ipture/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.ts
Fixed
Show fixed
Hide fixed
db36b13
to
9e4e28a
Compare
src/SIL.XForge.Scripture/ClientApp/src/app/translate/draft-generation/draft-sources.stories.ts
Fixed
Show fixed
Hide fixed
57f317a
to
7bc01ef
Compare
7bc01ef
to
0883547
Compare
(I pushed a conflict resolution.) |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2962 +/- ##
==========================================
- Coverage 82.64% 82.47% -0.17%
==========================================
Files 553 554 +1
Lines 32010 32197 +187
Branches 5164 5230 +66
==========================================
+ Hits 26454 26554 +100
- Misses 4797 4872 +75
- Partials 759 771 +12 ☔ View full report in Codecov by Sentry. |
feaf535
to
e0f85ff
Compare
I worked on designing a TestActivatedProjectModule that we could import to help us have needed dependencies for TestActivatedProjecctService. Unfortunately I didn't really have a working base upon which to make the change and work toward the tests working again. After working on it for a bit, I had tests running more nicely, but failing, presumably without project data being provided in the right places. So I rolled back and wrote a simpler solution to TestActivatedProjectService. After working on that for a bit, I had all the same problems as before. I committed both. We need to provide the list of projects to the tests. |
e0f85ff
to
6fbf7ff
Compare
...e/ClientApp/src/app/translate/draft-generation/draft-sources/draft-sources.component.spec.ts
Fixed
Show fixed
Hide fixed
…rvice
Based on some discussion of the philosophy of testing this component at this time. The 'should not save when language codes are not confirmed' test would be presumably passing for the wrong reason at this time.
…hat are no longer available
This change is