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

WIP: Mapknitter Rails Upgrade #669

Open
wants to merge 179 commits into
base: main
Choose a base branch
from
Open

WIP: Mapknitter Rails Upgrade #669

wants to merge 179 commits into from

Conversation

alaxalves
Copy link
Member

@alaxalves alaxalves commented Jun 5, 2019

Since me and @kaustubh-nair have been using development branch to get our work reviewed and merged faster, we have opened this PR to keep comparing with main branch.

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • 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

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

@uploaded_data = Rack::Test::UploadedFile.new(file_location.to_s, 'demo.png', "image/png")
@file ||= File.open(File.expand_path(Rails.root + 'test/fixtures/demo.png', __FILE__))
@uploaded_data = ActionDispatch::Http::UploadedFile.new(tempfile: @file, filename: File.basename(@file), type: "image/png")
PaperTrail.enabled = true
end
Copy link
Member

Choose a reason for hiding this comment

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

This change is causing the controller tests to fail
@alaxalves

Copy link
Member

Choose a reason for hiding this comment

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

I don't understand how it's working in main but not here

Copy link
Member Author

Choose a reason for hiding this comment

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

Maybe some new Rails 5 class related thing

@kaustubh-nair
Copy link
Member

@alaxalves Image placement has again stopped working here

@alaxalves
Copy link
Member Author

@kaustubh-nair Can you update rails-5 branch with development ?? Since u fixed the controller tests

kaustubh-nair and others added 11 commits August 15, 2019 11:09
* Add new system tests and fix minor asset loading

* modify test

* Add chromedriver to travis

* Add sudo

* Add dependencies to dockerfile

* Properly installing chrome and chromedriver
* WIP action cable setup

* basic action cable setup complete

* minor change

* minor changes

* few changes

* initial working functionality complete

* Refactoring code

* Adding Foreman gem

* Scheduling Puma and Passenger servers

* WIP action cable setup

* basic action cable setup complete

* minor change

* minor changes

* few changes

* initial working functionality complete

* Refactoring code

* Adding Foreman gem

* Scheduling Puma and Passenger servers

* few minor fix

* added a few tests

* Refactoring connection module

* Using strong params in requests

* added documentation

* added more docs

* added tests

* Using puma as dependency and correct image controller

* added a few tests

* a few changes

* remove unnecessary render

* few test fixes
* few bug fixes

* separate editing channels for different maps

* test fixes

* rubocop fixes
@cesswairimu
Copy link
Collaborator

I believe we merged rails 5.2 upgrade on another PR...closing this

@alaxalves
Copy link
Member Author

I believe we merged rails 5.2 upgrade on another PR...closing this

This PR tracks the entire upgrade, not only Rails 5.2. We'll need this branch when Rails 6 is shipped.

@alaxalves alaxalves reopened this Jan 20, 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.

5 participants