External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 03:51:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source 
Conflicts:
	Mage.Sets/src/mage/cards/s/SalvageTrader.java
	Mage.Sets/src/mage/cards/t/ThermalDetonator.java
This commit is contained in:
LevelX2 2018-08-15 10:51:21 +02:00
commit 2429425fd2
6 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/BestowTest.java
View file

@ -1,4 +1,3 @@
package org.mage.test.cards.abilities.keywords;
import mage.abilities.mana.ManaOptions;
@ -8,7 +7,6 @@ import mage.constants.SubType;
import mage.constants.Zone;
import mage.game.permanent.Permanent;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.mage.test.serverside.base.CardTestPlayerBase;
@ -164,7 +162,6 @@ public class BestowTest extends CardTestPlayerBase {
* http://www.mtgsalvation.com/forums/magic-fundamentals/magic-rulings/magic-rulings-archives/513828-bestow-far-away
*/
@Test
@Ignore // Handling of targets of Fused spells is not handled yet in TestPlayer class
public void bestowWithFusedSpell() {
addCard(Zone.BATTLEFIELD, playerA, "Mountain", 2);
/**
@ -183,22 +180,22 @@ public class BestowTest extends CardTestPlayerBase {
addCard(Zone.BATTLEFIELD, playerB, "Swamp", 3);
addCard(Zone.BATTLEFIELD, playerB, "Island", 2);
/**
* Far {1}{U} Instant Return target creature to its owner's hand. Away
* {2}{B} Instant Target player sacrifices a creature. Fuse (You may
* cast one or both halves of this card from your hand.)
*/
// Instant
// Far {1}{U} Return target creature to its owner's hand.
// Away {2}{B} Target player sacrifices a creature.
// Fuse (You may cast one or both halves of this card from your hand.)
addCard(Zone.HAND, playerB, "Far // Away");
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Nyxborn Rollicker using bestow", "Cyclops of One-Eyed Pass");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "fused Far // Away", "Cyclops of One-Eyed Pass^targetPlayer=PlayerA");
playerA.addTarget("Nyxborn Rollicker");
castSpell(1, PhaseStep.POSTCOMBAT_MAIN, playerB, "fused Far // Away", "Cyclops of One-Eyed Pass");
addTarget(playerB, playerA);
addTarget(playerA, "Nyxborn Rollicker");
setStopAt(1, PhaseStep.END_TURN);
execute();
assertHandCount(playerA, 0);
assertHandCount(playerA, "Cyclops of One-Eyed Pass", 1);
assertHandCount(playerB, 0);
assertGraveyardCount(playerB, "Far // Away", 1);