-
Notifications
You must be signed in to change notification settings - Fork 15
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
clone event #78
Open
angeluss88
wants to merge
2
commits into
master
Choose a base branch
from
clone-event
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
clone event #78
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -10,17 +10,19 @@ Background: | |
| event | My event | My another awesome event! | 2016-03-01 10:00 | 2016-03-01 18:00 | Burj Khalifa Tower | [email protected] | http://localhost:8000 | | ||
| event2 | My other event | My other awesome event! | 2016-03-01 10:00 | 2016-03-01 18:00 | Burj Khalifa Tower | [email protected] | http://eventator.loc:8080 | | ||
| event3 | His event | His another awesome event! | 2016-04-01 10:00 | 2016-04-01 18:00 | Kuala-lumpur Tower | [email protected] | http://event.com | | ||
| event4 | Local event | My local awesome event! | 2016-04-01 10:00 | 2016-04-01 18:00 | Kuala-lumpur Tower | [email protected] | http://eventator.loc | | ||
And following "EventTranslation": | ||
| event | locale | | ||
| event | ru_RU | | ||
| event | de_DE | | ||
| event2 | ru_RU | | ||
| event2 | de_DE | | ||
| event3 | ru_RU | | ||
| event4 | ru_RU | | ||
And following "Organizer": | ||
| ref | title | description | isActive | events | | ||
| organizer | My organizer | My another awesome organizer! | 1 | event,event2,event3 | | ||
| organizer2 | His organizer | His another awesome organizer! | 1 | event2,event3 | | ||
| ref | title | description | isActive | events | | ||
| organizer | My organizer | My another awesome organizer! | 1 | event,event2,event3 | | ||
| organizer2 | His organizer | His another awesome organizer! | 1 | event2,event3,event4 | | ||
And following "OrganizerTranslation": | ||
| organizer | locale | | ||
| organizer | ru_RU | | ||
|
@@ -105,7 +107,7 @@ Background: | |
And following "Sponsor": | ||
| ref | company | description | homepage | type | isActive | events | | ||
| sponsor | Reseach Supplier | NASA research center | http://nasa.gov.us | 1 | 1 | event,event2,event3 | | ||
| sponsor2 | KnpLabs | Happy awesome developer | http://knplabs.com | 2 | 1 | event | | ||
| sponsor2 | KnpLabs | Happy awesome developer | http://knplabs.com | 2 | 1 | event,event4 | | ||
And following "SponsorTranslation": | ||
| sponsor | locale | | ||
| sponsor | de_DE | | ||
|
@@ -145,7 +147,26 @@ Scenario: Admin should have able to add event | |
And I press "Add" | ||
Then I wait for a form | ||
Then I should see "Event Test event added." | ||
Then I should see the row containing "4;Test event;UA;May 1, 2016 10:00;May 1, 2016 18:00" | ||
Then I should see the row containing "5;Test event;UA;May 1, 2016 10:00;May 1, 2016 18:00" | ||
|
||
@javascript | ||
Scenario: Admin should be able to clone event | ||
Given I am sign in as admin | ||
When I click "Events" | ||
Then I wait for a form | ||
Then I should see "Add Event" | ||
And I should see the row containing "1;My event;March 1, 2016 10:00;March 1, 2016 18:00" | ||
When I click "expand-1" on the row containing "1;My event;March 1, 2016 10:00;March 1, 2016 18:00" | ||
When I click "Clone" on the row containing "1;My event;March 1, 2016 10:00;March 1, 2016 18:00" | ||
Then I wait for a form | ||
Then I should see "Event settings" | ||
And I fill in "Host" with "http://testevent.loc" | ||
And I fill in "Title" with "Cloned event" | ||
And I check "Is active" | ||
And I press "Add" | ||
Then I wait for a form | ||
Then I should see "Event Cloned event added." | ||
Then I should see the row containing "5;Cloned event;UA;May 1, 2016 10:00;May 1, 2016 18:00" | ||
|
||
@javascript | ||
Scenario: Admin should have able to update event settings | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -289,6 +289,18 @@ public function getId() | |
return $this->id; | ||
} | ||
|
||
/** | ||
* Set id | ||
* | ||
* @param int $id | ||
* @return integer | ||
*/ | ||
public function setId($id) | ||
{ | ||
$this->id = $id; | ||
return $this; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. CS, add new nl above the |
||
} | ||
|
||
/** | ||
* Set host | ||
* | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CS
if (
space