fastlane-old / snapshot

Automate taking localized screenshots of your iOS app on every device
https://fastlane.tools
1.95k stars 141 forks source link

Alert management #375

Closed maxbritto closed 8 years ago

maxbritto commented 8 years ago
maxbritto commented 8 years ago

This PR is following this one : https://github.com/fastlane/snapshot/pull/289

ohayon commented 8 years ago

Thanks @maxbritto ! This is awesome!

Just one question above and then we can :shipit: !

maxbritto commented 8 years ago

Ok I've updated the code to address your question. I kept it the default behavior to not wait for alerts before a snapshot but it's just a boolean to enable the wait. This is the same behavior as with the 'waitForLoadingIndicator' parameter. But since @KrauseFx told to enable it by default if it works I don't know what to do

ohayon commented 8 years ago

You can enable it by default if you'd like, especially given @KrauseFx's endorsement.

maxbritto commented 8 years ago

Ok I did, but I left the automatic dismissal of alerts as an opt-in because I suppose some developer may want to control what to do with their alerts instead of dismissing them. I added some documentation to explain how to use it if needed (as logging in the setup.rb and as and when waiting for an alert for too long)

ohayon commented 8 years ago

okay, so final thing. would you mind squashing the commits? i know you're new to git, so here are some rough instructions:

$ git rebase -i HEAD~5 you'll now be in an interactive rebase, you'll be asked how to handle each commit, and can choose fixup for all commits except for the first commit on this branch. on the first commit in this branch, choose reword and you'll be prompted to enter a new commit message for the single commit that will represent the branch.

you'll then need to do git push origin <branch name> --force

maxbritto commented 8 years ago
capture d ecran 2016-01-07 a 23 14 24

Ok, just to be sure, I have 258 commands that are by default on pick I have to search/replace all of them by fixup and replace only the one for the e3c148e by reword ?

ohayon commented 8 years ago

wah, okay. so there looks like there is a bit of an issue because there was a merge commit first, was your first commit e3d148e ?

maxbritto commented 8 years ago

Yes it is the first one of four.

ohayon commented 8 years ago

ah, okay. so we will have to do a bit more surgery.

i think you should try to do the following.

first- check out a new branch from where you are git checkout -b backup, to back it up go back to this branch and then do a git reset e3d148e that will bring you back to the beginning of your changes, then do git stash to hold on to the changes for a few minutes then do git checkout master and then git pull https://github.com/fastlane/snapshot.git master to get the most recent changes on master delete this branch with git branch -D <this branch name> the do git checkout -b <this same branch name> followed by git stash pop to get your changes back finally, commit those changes and push again

ohayon commented 8 years ago

ah, this is a bit tougher than i thought. i am pulling down the changes and seeing what i can do

maxbritto commented 8 years ago

Or I can save my 3 files, delete my branch an cancel this PR then do a new one with one commit ? We'll loose the benefit of this discussion though

ohayon commented 8 years ago

thats not a bad idea, but if you call your new branch, the same thing as this one, i think it should update it.

maxbritto commented 8 years ago

I tried to do something that ended up in https://github.com/fastlane/snapshot/pull/378 but I have the feeling that it wasn't the right way since I see the commit from november in it :(

KrauseFx commented 8 years ago

Should this be closed in favor of the other PR?

maxbritto commented 8 years ago

@KrauseFx : probably, I'm doing it now