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

Multiple and parallel multiple events #1091

Merged
merged 1 commit into from Jun 27, 2019
Merged

Multiple and parallel multiple events #1091

merged 1 commit into from Jun 27, 2019

Conversation

ElCondor1969
Copy link
Contributor

This PR resolve the issue #1090.

@bpmn-io-tasks bpmn-io-tasks bot added the needs review Review pending label Jun 18, 2019
@ElCondor1969
Copy link
Contributor Author

ElCondor1969 commented Jun 18, 2019

Then I'll add the test cases.
If anyone can direct me on how to write them, they are welcome.

This diagram diagram1.zip can be used.

@pinussilvestrus
Copy link
Contributor

First thanks for your contribution! From a first check of the look and feel the changes seems to follow the intended behavior. Some hints for adjusting your PR:

Test Cases

You can have a look on how we currently test the BpmnRenderer. You could, for example, adjusting the test bpmn file with cases which fits the scenario.

Even better: Test the resulting rendered shape. But it seems like we're not doing it that way in other cases atm.

Commit guidelines

Have a look at our contribution guidelines. There you will also find our commit message guidelines. It would be very nice if you could adjust your commit message, just like this:

feat(bpmn-renderer): correctly render all parallel and multiple events

Closes #1090 

@ElCondor1969
Copy link
Contributor Author

Hi, Pinus.
Thanks for your suggestions.
In fact, I also thought that the test should check the shape within the event according to the different configurations, but I didn't understand how to do it. But the problem doesn't arise because you confirm that even in other test cases you never check the shape inside the event.
Then I analyzed the file you indicated to me ("events.bpmn") and it seems to me that it is already perfect because, inside, events with more event definitions are defined and I checked that the modeler draws them correctly.
So this file already includes the necessary test for this PR.
Tell me if it's okay for you.
About the commit message, I'll update it with your model by next commits or, anyway, as soon as you tell me that the PR doesn't need any further changes.

@pinussilvestrus
Copy link
Contributor

It would be nice if you can add more events in the events.bpmn so we verify different cases. Just like you described in #1090 (cf. MessageEventDefinition and SignalEventDefinition).

Can you do a double-check on your commits? Seems like there are two (one empty).

@ElCondor1969
Copy link
Contributor Author

Hi, Pinus.
I updated the file "events.bpmn" adding two lines with the events with more event definitions.
At this point we should be there.
About the previous commit, I think I had messed up a bit to correct the commit message with the one you suggested.
But now should be all ok.

@pinussilvestrus
Copy link
Contributor

Hi @ElCondor1969 ,

So now there are 4 commits listed... Any Chance to have one clear commit?

Additionaly @barmac mentioned we should double-check the new boundary detach functionality with this changes. I'll do it.

@ElCondor1969
Copy link
Contributor Author

Hi @pinussilvestrus
Yes, in fact I have made four commits and the last one is, of course, what counts.
Maybe you mean I shouldn't have given each commit the same label?
What would you propose to make the situation "clear"?
Maybe a further commit that would only have the purpose to add a definitive label for the PR?
Please tell me what there is to do.

@barmac
Copy link
Member

barmac commented Jun 27, 2019

@ElCondor1969 What we would like to achieve is one commit that contains all of the changes that you created. This can be achieved via interactive rebase and commit squashing. You can read about this here: http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

Note that you will have to git push -f after the history rewriting is done. I'd suggest to create a backup branch before you start the work in case anything goes wrong.

@ElCondor1969
Copy link
Contributor Author

Hi @barmac.
I'll try to do what you pointed out, hoping not to mess anything up.

@ElCondor1969
Copy link
Contributor Author

Hi @barmac
I followed your instructions and rebased
There should only be one commit now, if I did things right.
Please tell me if everything is okay now.

Copy link
Contributor

@pinussilvestrus pinussilvestrus left a comment

Choose a reason for hiding this comment

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

LGTM right now 🏆

@merge-me merge-me bot merged commit 92bdcb8 into bpmn-io:master Jun 27, 2019
@bpmn-io-tasks bpmn-io-tasks bot removed the needs review Review pending label Jun 27, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants