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

Added missing css files to assets.rb file #7546

Merged
merged 1 commit into from Mar 24, 2020

Conversation

Tlazypanda
Copy link
Collaborator

Fixes #7529

  • PR is descriptively titled 📑 and links the original issue above 🔗
  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts 📁
  • screenshots/GIFs are attached 📎 in case of UI updation
  • ask @publiclab/reviewers for help, in a comment below

@codecov
Copy link

codecov bot commented Feb 20, 2020

Codecov Report

Merging #7546 into master will decrease coverage by 0.11%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7546      +/-   ##
==========================================
- Coverage   82.02%   81.90%   -0.12%     
==========================================
  Files          97       97              
  Lines        5612     5615       +3     
==========================================
- Hits         4603     4599       -4     
- Misses       1009     1016       +7     
Impacted Files Coverage Δ
app/controllers/users_controller.rb 82.29% <100.00%> (+0.18%) ⬆️
app/services/execute_search.rb 88.88% <0.00%> (-5.56%) ⬇️
app/api/srch/search.rb 65.35% <0.00%> (-3.93%) ⬇️

@Tlazypanda Tlazypanda requested review from jywarren and VladimirMikulic and removed request for VladimirMikulic February 20, 2020 09:35
@Tlazypanda
Copy link
Collaborator Author

@jywarren @VladimirMikulic can you kindly review this? Thanks ✌️

Copy link
Contributor

@VladimirMikulic VladimirMikulic left a comment

Choose a reason for hiding this comment

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

Wouldn't it be better to place these in application.css since these are not referenced with stylesheet_link_tag and are not required to be in this file?

@Tlazypanda
Copy link
Collaborator Author

@VladimirMikulic have moved the files to application.css ..there's only 1 file since remaining are present already in assets.rb and application.css.Can you kindly review? Thanks ✌️

Copy link
Contributor

@VladimirMikulic VladimirMikulic left a comment

Choose a reason for hiding this comment

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

This is great. Thanks @Tlazypanda for awesome work you've done 🚀

@Tlazypanda
Copy link
Collaborator Author

@cesswairimu not sure how to make travis pass 😅

@cesswairimu
Copy link
Collaborator

We will just restart and restart again 😆..sorry travis can be frustrating

@plotsbot
Copy link
Collaborator

1 Warning
⚠️ There was an error with Danger bot’s Junit parsing: No JUnit file was found at output.xml
2 Messages
📖 @Tlazypanda Thank you for your pull request! I’m here to help with some tips and recommendations. Please take a look at the list provided and help us review and accept your contribution! And don’t be discouraged if you see errors – we’re here to help.
📖 #
Screenshots 📸 (click to expand)

7546-test_questions.png

7546-test_embeddable_grids.png

7546-test_signup.png

7546-test_viewing_the_settings_page.png

7546-test_tag_by_author_page.png

7546-failures_test_removing_tags_from_the_post.png

7546-test_wiki_page_with_inline_grids.png

7546-test_stats.png

7546-test_viewing_the_dashboard.png

7546-test_searching_an_item_from_the_homepage.png

7546-test_signup_modal_form_validation.png

7546-test_tag_stats.png

7546-test_login_modal_form_validation.png

7546-test_questions_shadow.png

7546-test_login_modal.png

7546-test_profile_page.png

7546-test_comments.png

7546-test_tags.png

7546-test_signup_modal.png

7546-test_wiki.png

7546-test_methods.png

7546-test_tag_page.png

7546-test_blog_page_with_location_modal.png

7546-test_tag_wildcard.png

7546-test_signup_modal_disabled_submit_button_on_empty_username.png

7546-test_embeddable_thumbnail_grids.png

7546-test_front_page_with_navbar_search_autocomplete.png

7546-test_spam_moderation_page.png

7546-test_login.png

7546-test_viewing_the_dropdown_menu.png

7546-test_viewing_question_post.png

7546-test_mobile_displays.png

7546-failures_test_main_textarea_image_drag_and_drop_upload.png

7546-test_simple-data-grapher_powertag.png

7546-test_front.png

7546-test_question_page.png

7546-test_tag_contributors_page.png

7546-test_blog.png

7546-failures_test_thumbnail_image_drag_and_drop_upload.png

7546-test_people.png

7546-test_wiki_revisions.png

Learn about automated screenshots

Generated by 🚫 Danger

@Tlazypanda
Copy link
Collaborator Author

@cesswairimu travis passed this time but codecov failed 😆 😝

@Tlazypanda Tlazypanda closed this Mar 1, 2020
@Tlazypanda Tlazypanda reopened this Mar 1, 2020
@Tlazypanda Tlazypanda closed this Mar 3, 2020
@Tlazypanda Tlazypanda reopened this Mar 3, 2020
@Tlazypanda Tlazypanda closed this Mar 8, 2020
@Tlazypanda Tlazypanda reopened this Mar 8, 2020
@Tlazypanda
Copy link
Collaborator Author

@cesswairimu travis still failing 😢 can you help me out? 😅

@VladimirMikulic
Copy link
Contributor

@cesswairimu The line 12 of tag_selection unit test fails.
https://github.com/publiclab/plots2/blob/master/test/unit/tag_selection_test.rb

In the test file, we are doing math with "times".
If not done properly, this usually results in unstable tests.

Can we rewrite this test to preserve the functionality, but without "time" hacking?

@Tlazypanda your view on this?

@Tlazypanda
Copy link
Collaborator Author

@VladimirMikulic @cesswairimu Umm..going through this found these links might be helpful ...can you check it out? Thanks ✌️
https://www.greyblake.com/blog/2018-02-19-how-to-fix-intermittent-test-failures/
https://github.com/travisjeffery/timecop

@cesswairimu
Copy link
Collaborator

@Tlazypanda I have restarted travis, the test are all green now.

@jywarren
Copy link
Member

@cesswairimu The line 12 of tag_selection unit test fails.
https://github.com/publiclab/plots2/blob/master/test/unit/tag_selection_test.rb

In the test file, we are doing math with "times".
If not done properly, this usually results in unstable tests.

Can we rewrite this test to preserve the functionality, but without "time" hacking?

Oh wow great catch @VladimirMikulic. Would you be able to open an issue with this insight?

@jywarren jywarren merged commit cbb790a into publiclab:master Mar 24, 2020
@jywarren
Copy link
Member

Awesome! Thanks a lot!!!

@jywarren
Copy link
Member

🎉

@VladimirMikulic
Copy link
Contributor

@jywarren I'll open the issue and try to solve this issue once and for all!

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.

Missing css files in assets.rb file
6 participants