Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

Remove the To-do URL #4214

Merged
merged 6 commits into from
Dec 7, 2016
Merged

Conversation

chadwhitacre
Copy link
Contributor

@chadwhitacre chadwhitacre commented Nov 30, 2016

Closes #4166; part of #4130.

Todo

@chadwhitacre chadwhitacre changed the title Removing the todo URL Remove the todo URL Nov 30, 2016
@chadwhitacre
Copy link
Contributor Author

chadwhitacre commented Nov 30, 2016

Okay @JessaWitzel, this one's for you (ref)! :-)

Your first PR was for inside.gratipay.com ... this one is gonna be your first PR for gratipay.com itself! 💃

Here's what we are looking for here:

  • spin up your local environment to the point where you can see and submit the "Apply for a New Team" form locally—that's what you'll be working on here
  • find and remove the "To-do URL" field from the form
  • also remove the todo_url field from the teams table in the database
  • make sure the tests still pass
  • make sure the form still works

Does that give you enough to get started? For broader context, check the project linked in the sidebar here on GitHub (and check the "Details" on the project page). As always, if you're stuck after an hour, ask us a question here or on slack! Okay! Good luck! 👍 💃 🌻

@chadwhitacre chadwhitacre changed the title Remove the todo URL Remove the To-do URL Nov 30, 2016
@JessaWitzel
Copy link
Contributor

Have removed the to-do URL field from the form and the field from the teams table (I think) but when I try to create a team locally I receive gratipay.com/error.spt "Please fill out the 'To-do URL' field." Went into testing and removed the todo_url test but am still receiving error.

@chadwhitacre
Copy link
Contributor Author

chadwhitacre commented Nov 30, 2016

slack

@mattbk
Copy link
Contributor

mattbk commented Nov 30, 2016

This is how I like to solve problems like this: https://github.com/gratipay/gratipay.com/search?utf8=%E2%9C%93&q=Please+fill+out+the+%27To-do+URL%27+field.

(You can ignore i18n files, they are generated for translations.)

@JessaWitzel
Copy link
Contributor

The tests worked for a minute but then I had to clean and re: make schema make fake and the fake data was wrong. Now I am receiving a subprocess error when I try to run tests that stalls on the first test related to honcho?

@JessaWitzel JessaWitzel mentioned this pull request Dec 1, 2016
@JessaWitzel
Copy link
Contributor

Why does make test have so many more failures than make pytest? This passes when I make pytest.

JessaWitzel added a commit that referenced this pull request Dec 1, 2016
@JessaWitzel
Copy link
Contributor

I ended up removing all references to todo_url in the code, not just those related to the form because it didn't pass tests until I did. I hope that is what you wanted. :)

@chadwhitacre
Copy link
Contributor Author

!m @JessaWitzel

I see the tasks are ticked in #4214 (comment). Does that mean you're done here? If so, go ahead and move it to the "Landing" column on the project (see sidebar) and then ping a few of us here by name to let us know it's ready for review! :)

@JessaWitzel
Copy link
Contributor

Ready for review friends! @whit537 @mattbk @clone1018

@mattbk mattbk mentioned this pull request Dec 1, 2016
4 tasks
@mattbk mattbk added the Review label Dec 2, 2016
@mattbk
Copy link
Contributor

mattbk commented Dec 2, 2016

I got this when I submitted:

screen shot 2016-12-01 at 7 50 16 pm

@JessaWitzel
Copy link
Contributor

You know what? I fixed that and then after all of the testing errors I had to redo some things and never checked to see if I could submit the form. I will fix.

@JessaWitzel JessaWitzel removed the Review label Dec 2, 2016
@JessaWitzel
Copy link
Contributor

After cleaning my environment and removing cached files, the form works for me. Can you try that?
image

@mattbk
Copy link
Contributor

mattbk commented Dec 2, 2016

Success after make clean env!

@@ -546,7 +546,6 @@ BEGIN;
ALTER TABLE teams ALTER COLUMN getting_paid DROP NOT NULL;

ALTER TABLE teams ADD COLUMN onboarding_url text NOT NULL DEFAULT '';
ALTER TABLE teams ADD COLUMN todo_url text NOT NULL DEFAULT '';
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Soooo ... schema.sql is append-only. We shouldn't delete from it like this. Check in the README for how to modify the database. As usual, ping me/us if you get stuck. :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

Apologies. There is so much to remember!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No apologies necessary! You're doing great! :-)

, onboarding_url='http://INSIDE.GRATipay.com/'
, todo_url='hTTPS://github.com/GRATIPAY'
))
, onboarding_url='http://INSIDE.GRATipay.com/'))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry to be picky but can we match the parentheses formatting here as it was before? :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fixed in 6062804. :-)

@chadwhitacre
Copy link
Contributor Author

Looks good so far, @JessaWitzel! Good work! 💃

I was able to submit the form locally. 👍

I've left a couple todos (in the ticket description), one tiny and one more involved.

@chadwhitacre chadwhitacre changed the base branch from master to relax-open-work-requirement December 2, 2016 21:23
@mattbk mattbk added the Review label Dec 4, 2016
--https://github.com/gratipay/gratipay.com/pull/4214
BEGIN;
ALTER TABLE teams DROP COLUMN todo_url;
END;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@JessaWitzel Close! Rather than modifying sql/schema.sql directly, what we want is a file at sql/branch.sql (it shouldn't exist on your branch; you have to create it and add it to Git). If there's a file at sql/branch.sql then our deploy script takes care of appending it to sql/schema.sql after running sql/branch.sql against the production database. Make sense?

Copy link
Contributor

Choose a reason for hiding this comment

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

Makes sense. Thank you!

chadwhitacre pushed a commit that referenced this pull request Dec 5, 2016
@chadwhitacre
Copy link
Contributor Author

No output has been received in the last 10m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build has been terminated

@chadwhitacre
Copy link
Contributor Author

Aaaaaaaand #4224. 😩

@chadwhitacre
Copy link
Contributor Author

Returning from #4224 ...

@chadwhitacre
Copy link
Contributor Author

Builds restarted. Will it be as simple as that?

@chadwhitacre
Copy link
Contributor Author

Green! Let's see if we can land this ...

@chadwhitacre
Copy link
Contributor Author

Rebased, was 2596672.

chadwhitacre pushed a commit that referenced this pull request Dec 7, 2016
@chadwhitacre chadwhitacre force-pushed the relax-open-work-requirement branch 3 times, most recently from 1619f84 to cf13cc6 Compare December 7, 2016 20:03
@chadwhitacre
Copy link
Contributor Author

Hit #4224. Cache cleared for this PR and build restarted ...

@chadwhitacre
Copy link
Contributor Author

I removed the caches for remove-todo-url and relax-open-work-requirement for good measure. I left master.

@chadwhitacre
Copy link
Contributor Author

Looks like it's working! 💃

@chadwhitacre
Copy link
Contributor Author

I accidentally rebased 2596672 away! Brought it back with:

wget https://github.com/gratipay/gratipay.com/commit/2596672a354b0fb4518971cda8024e816979d7a8.patch
git am 2596672a354b0fb4518971cda8024e816979d7a8.patch

@chadwhitacre chadwhitacre merged commit 25018df into relax-open-work-requirement Dec 7, 2016
@chadwhitacre
Copy link
Contributor Author

Woo-hoo! Good work, @JessaWitzel! 💃 🌻

chadwhitacre added a commit that referenced this pull request Dec 8, 2016
@chadwhitacre chadwhitacre deleted the remove-todo-url branch January 2, 2017 15:42
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants