Skip to content
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

Rename PretestEngineService to QuestionPlayerEngineService #6913

Merged
merged 7 commits into from
Jun 16, 2019

Conversation

sophiewu6
Copy link
Contributor

Explanation

Since PretestEngineService is not only used by pretest but also by review test and practice sessions, its name should be changed.

@seanlip
Copy link
Member

seanlip commented Jun 13, 2019

Adding @vinitamurthi and @ankita240796 as initial reviewers (@vinitamurthi for the full PR, @ankita240796 for the typescript fix in extensions/classifiers/WinnowingPreprocessingService.ts).

Also @sophiewu6 please checkout a fresh copy of package-lock.json and push that, thanks! (In general if package.json is not modified there should be no modification to package-lock.json. I think @apb7 or @NishealJ is working on tooling for fixing this automatically.)

Copy link
Contributor

@ankita240796 ankita240796 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, for the type error fix! Thanks, @sophiewu6!

@codecov
Copy link

codecov bot commented Jun 13, 2019

Codecov Report

Merging #6913 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           develop   #6913   +/-   ##
=======================================
  Coverage     95.5%   95.5%           
=======================================
  Files          371     371           
  Lines        51058   51058           
=======================================
  Hits         48762   48762           
  Misses        2296    2296

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8050e7c...de18cb0. Read the comment docs.

@codecov
Copy link

codecov bot commented Jun 13, 2019

Codecov Report

Merging #6913 into develop will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff            @@
##           develop    #6913   +/-   ##
========================================
  Coverage    95.68%   95.68%           
========================================
  Files          371      371           
  Lines        51429    51429           
========================================
  Hits         49212    49212           
  Misses        2217     2217

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3069fe6...040cf8f. Read the comment docs.

@sophiewu6
Copy link
Contributor Author

Hi @seanlip For some reason my local stack won't be able to start because of npm errors if I'm using the original package-lock.json, so I had to delete it and generate a new one. Any idea why that happens?

@seanlip
Copy link
Member

seanlip commented Jun 13, 2019

There is an issue with package-lock.json where it unfortunately generates a different version for Mac vs Linux platforms. See #6736

@sophiewu6
Copy link
Contributor Author

@seanlip I understand that but why does the original package-lock.json file cause npm errors for me? It stopped me from starting the local stack.

@seanlip
Copy link
Member

seanlip commented Jun 13, 2019

That, I am afraid I do not know, sorry. Have you file an issue for that with the error trace?

@sophiewu6
Copy link
Contributor Author

@seanlip Not yet. I'll do that. I just realized that I can't even push the reverted version of package-lock.json because it stops me from running any script, including frontend tests, and the tests will be run automatically before pushing.

@seanlip
Copy link
Member

seanlip commented Jun 13, 2019

I see, OK. Let's keep what you have here, then, but /cc @oppia/dev-workflow-team and especially @apb7 for info.

@vinitamurthi
Copy link
Contributor

vinitamurthi commented Jun 13, 2019

@sophiewu6 @seanlip I have a hack for this, but it's unsafe
Basically what you can do is once you've pushed your PR changes in (with the modified package-lock.json) you can add another commit to your local branch removing the package-lock changes. Then push only that commit using the git command to push a specific commit.
git push <remotename> <commit SHA>:<remotebranchname>
That won't trigger tests. It's a bad hack though

Copy link
Contributor

@vinitamurthi vinitamurthi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! @aks681 could you also take a look? We are making the PretestEngineService a more generic one for the question player. Eventually we will move the pretest also to use the question player directive.

@vinitamurthi vinitamurthi removed their assignment Jun 14, 2019
@sophiewu6
Copy link
Contributor Author

Hi @seanlip I have pushed the reverted version of package-lock.json to this PR and the other one.

@seanlip seanlip removed the request for review from vojtechjelinek June 14, 2019 22:21
@seanlip
Copy link
Member

seanlip commented Jun 14, 2019

@aks681 @prasanna08 PTAL, this PR needs your approval to get merged. Thanks!

@seanlip
Copy link
Member

seanlip commented Jun 16, 2019

@aks681 PTAL, thanks!

Copy link
Contributor

@aks681 aks681 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@aks681 aks681 merged commit 46ae61e into oppia:develop Jun 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants