File tree Expand file tree Collapse file tree 14 files changed +21
-14
lines changed
dev/tests/integration/testsuite/Magento
Controller/Adminhtml/Order
Shipping/Controller/Adminhtml/Order/Shipment
lib/internal/Magento/Framework/Mail Expand file tree Collapse file tree 14 files changed +21
-14
lines changed Original file line number Diff line number Diff line change @@ -685,7 +685,7 @@ public function testConfirmationEmailWithSpecialCharacters()
685
685
686
686
$ this ->assertContains ('To: ' . $ email , $ rawMessage );
687
687
688
- $ content = $ message ->getBody ()->getPartContent ( 0 );
688
+ $ content = $ message ->getBody ()->getParts ()[ 0 ]-> getRawContent ( );
689
689
$ confirmationUrl = $ this ->getConfirmationUrlFromMessageContent ($ content );
690
690
$ this ->setRequestInfo ($ confirmationUrl , 'confirm ' );
691
691
$ this ->clearCookieMessagesList ();
Original file line number Diff line number Diff line change 6
6
7
7
namespace Magento \Newsletter \Model ;
8
8
9
+ /**
10
+ * \Magento\Newsletter\Model\Subscriber tests
11
+ */
9
12
class SubscriberTest extends \PHPUnit \Framework \TestCase
10
13
{
11
14
/**
@@ -39,7 +42,7 @@ public function testEmailConfirmation()
39
42
$ this ->assertContains (
40
43
'/newsletter/subscriber/confirm/id/ ' . $ this ->_model ->getSubscriberId ()
41
44
. '/code/ysayquyajua23iq29gxwu2eax2qb6gvy ' ,
42
- $ transportBuilder ->getSentMessage ()->getRawMessage ()
45
+ $ transportBuilder ->getSentMessage ()->getBody ()-> getParts ()[ 0 ]-> getRawContent ()
43
46
);
44
47
$ this ->assertEquals (Subscriber::STATUS_NOT_ACTIVE , $ this ->_model ->getSubscriberStatus ());
45
48
}
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ public function testSendEmailOnOrderSave()
141
141
);
142
142
143
143
$ this ->assertEquals ($ message ->getSubject (), $ subject );
144
- $ this ->assertThat ($ message ->getRawMessage (), $ assert );
144
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ assert );
145
145
}
146
146
147
147
/**
Original file line number Diff line number Diff line change @@ -54,7 +54,7 @@ public function testSendEmailOnAddCreditmemoComment()
54
54
);
55
55
56
56
$ this ->assertEquals ($ message ->getSubject (), $ subject );
57
- $ this ->assertThat ($ message ->getRawMessage (), $ messageConstraint );
57
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ messageConstraint );
58
58
}
59
59
60
60
/**
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ public function testSendEmailOnCreditmemoSave()
51
51
);
52
52
53
53
$ this ->assertEquals ($ message ->getSubject (), $ subject );
54
- $ this ->assertThat ($ message ->getRawMessage (), $ messageConstraint );
54
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ messageConstraint );
55
55
}
56
56
57
57
/**
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ public function testSendOrderEmail()
82
82
);
83
83
84
84
$ this ->assertEquals ($ message ->getSubject (), $ subject );
85
- $ this ->assertThat ($ message ->getRawMessage (), $ assert );
85
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ assert );
86
86
}
87
87
88
88
/**
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ public function testSendEmailOnAddInvoiceComment()
55
55
);
56
56
57
57
$ this ->assertEquals ($ message ->getSubject (), $ subject );
58
- $ this ->assertThat ($ message ->getRawMessage (), $ messageConstraint );
58
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ messageConstraint );
59
59
}
60
60
61
61
/**
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ public function testSendInvoiceEmail()
59
59
);
60
60
61
61
$ this ->assertEquals ($ message ->getSubject (), $ subject );
62
- $ this ->assertThat ($ message ->getRawMessage (), $ messageConstraint );
62
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ messageConstraint );
63
63
}
64
64
65
65
/**
Original file line number Diff line number Diff line change @@ -51,7 +51,7 @@ public function testSendEmailOnInvoiceSave()
51
51
);
52
52
53
53
$ this ->assertEquals ($ message ->getSubject (), $ subject );
54
- $ this ->assertThat ($ message ->getRawMessage (), $ messageConstraint );
54
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ messageConstraint );
55
55
}
56
56
57
57
/**
Original file line number Diff line number Diff line change @@ -95,6 +95,6 @@ public function testSendEmailOnOrderPlace()
95
95
);
96
96
97
97
$ this ->assertEquals ($ message ->getSubject (), $ subject );
98
- $ this ->assertThat ($ message ->getRawMessage (), $ assert );
98
+ $ this ->assertThat ($ message ->getBody ()-> getParts ()[ 0 ]-> getRawContent (), $ assert );
99
99
}
100
100
}
You can’t perform that action at this time.
0 commit comments