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

Example pages #401

Merged
merged 6 commits into from
Mar 3, 2020
Merged

Example pages #401

merged 6 commits into from
Mar 3, 2020

Conversation

nstjean
Copy link
Contributor

@nstjean nstjean commented Feb 13, 2020

This is just some cleanup. I organized and labeled the required dependencies on each of the example map pages, as well as making them the same between the three of them and in the readme.

In the readme I've moved the "Browse layers" dependencies up to the main "Dependencies" section. I've also renamed it to "New Layers Menu" for clarity.

Copy link
Contributor

@cesswairimu cesswairimu left a comment

Choose a reason for hiding this comment

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

Superb 🎉 🎉 This is great 🚀

@nstjean
Copy link
Contributor Author

nstjean commented Feb 24, 2020

@crisner It looks like the cypress tests are all failing. Can you take a look?

@crisner
Copy link
Contributor

crisner commented Feb 24, 2020

Wow! All Cypress specs seem to have failed. These tests use index.html. Can you check if anything's missing or anything has been changed that is affecting the tests?

Are the tests passing locally? If yes, then it must be a timing issue. If they are failing locally and if there are no changes affecting the changes you could try to increase the wait time to see if they are passing.

@nstjean
Copy link
Contributor Author

nstjean commented Feb 24, 2020

Ok I got most of them fixed, it was an issue with a changed include script.

However the fracTrackerMobile minimal mode tests are failing for me even on the master branch.

leaflet-environmental-layers - Google Chrome_064

@nstjean
Copy link
Contributor Author

nstjean commented Feb 24, 2020

Oh sure, and it goes and passes, haha! Ok this is all set! @cesswairimu

README.md Outdated
<script src="../node_modules\jquery\dist\jquery.min.js"></script>
<script src="../node_modules\bootstrap\dist\js\bootstrap.min.js"></script>
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like this slipped through during a merge conflict fix?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh yeah, it sure did. And it looks like there were some in there from before. I think I fixed it all.

@@ -1,6 +1,6 @@
describe('Eonet fires layer', function() {
it('adds markers on click', function() {
cy.openWindow('/example/index.html#lat=43.00&lon=-83.00&zoom=3&layers=Standard')
cy.openWindow('/example/index.html#lat=43.00&lon=-80.00&zoom=4&layers=Standard')
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

Copy link
Member

@jywarren jywarren left a comment

Choose a reason for hiding this comment

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

Super. Thanks a ton for this cleanup!

@jywarren jywarren merged commit b283e1d into publiclab:master Mar 3, 2020
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.

4 participants