From 80c482428d5f2c9bcc299a18a434682355b72e4e Mon Sep 17 00:00:00 2001
From: Rishi Gupta <rishig@zulipchat.com>
Date: Thu, 18 Oct 2018 10:08:05 -0700
Subject: [PATCH] billing: Update test_upgrade_with_outdated_seat_count to use
 @mock_stripe.

---
 ...outdated_seat_count:Customer.create.1.json | Bin 0 -> 1583 bytes
 ...tdated_seat_count:Customer.retrieve.1.json | Bin 0 -> 4850 bytes
 ...ated_seat_count:Subscription.create.1.json | Bin 0 -> 2134 bytes
 ...th_outdated_seat_count:Token.create.1.json | Bin 0 -> 834 bytes
 corporate/tests/test_stripe.py                |  35 +++++++++---------
 5 files changed, 17 insertions(+), 18 deletions(-)
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.create.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.retrieve.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Subscription.create.1.json
 create mode 100644 corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Token.create.1.json

diff --git a/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.create.1.json b/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.create.1.json
new file mode 100644
index 0000000000000000000000000000000000000000..a6f9f917d4ac1866c6f554a9c684e0e9f8e8e5d6
GIT binary patch
literal 1583
zcmb_cO>Yx15WVv&Rz87L(QLkGI8jIi5-Or9t*RnqIrc2;)@yHV@3v{x|BlD&O*ha8
z4&;(##xwKg&6|06k!6H&ZW`_BiYcZ!khj@r5AECn^B}_id^TAe9E>NkdFN=X1<lvN
zqZ_57O+djK<*74`jX4NsR?vKT47coKIr>mt+*JB@K3kj|FE8GZ6r`lSX+Zmss$j}N
zGCOW%?WNJdPVO5e>+I!a{8~c$Dg{dyaSu^I#iYWRl2r=)yBPYKo2m<u*bL!~qf7JY
zd|ez}o{apLt7-D;)<_Ptwou4Bd^w#SEb{sL&aGq%l@Z9#6VwVk6U?(<d<dKc)&gm&
zqFtptMsAGGTg)0kk?{I4c57Bwz>xq1=1m2*tLI8t*HZrso(;<#yY8u4s{K9I&Ju=*
zg9%~5Im)HSL6NVF%R=&mX!{9{-^N#GT85Elr#?*HJ@+;Y406nOrUlr{mykJNdpn;}
zUIM?yfSS3T8OPy4-y}jqRVMrnq3m|w%NmnU@besq;NJ~lWtonWIG2tMqoc4ABd1%A
zeng?>4jm=@yyd$Ki?wEz<Ww=|r++pFcQvhy_GNHQP$VfQ+SkBPMdQ(A=qZ9wz}8mA
zRU&h7c=2s<e%anyGoKxO9=1?4T6D6)4Hwc6ooPe<y1EHakDpA()A2CRa4(|FQ$T1N
zhe-|vLy_4|>&ZFTgaBZe&YNq{@}A*Ipdoi@aBQfUM9yRU{?Tz2w%-N*?AEFVNj>FP
z()Dc<Z#+}9KP7oe(b#xL_S<~FUrUF-e!Cp|{YHlR-8#EwwYgr;Eb4!N7_W0^=bs^N
eA=&`-?2bxZm_#J@O?n$`!Q!=ug!fE8zW4<w#=STI

literal 0
HcmV?d00001

diff --git a/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.retrieve.1.json b/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Customer.retrieve.1.json
new file mode 100644
index 0000000000000000000000000000000000000000..72dcc92089d8114daea1b2526fe9be3d27fb1c8e
GIT binary patch
literal 4850
zcmc&&+in{-5Pi>A2>a9mK_XeQEfpx*)DGG-bzL_XxG9PS&7~|Rdke{xEgSy#&J4*F
zSK_YSr{*D+IfpYt&YZ)M@1KoE3FEwKN|Ro(oRwT8-;Ku4ah)r{jL6{k$>DS{pC3#Q
zkF23lN|by9mZZ^HLW`MLvL-jFt{O#7?!gCo&oU*nPPsI+;Sa{;QgYf9nlS}Mh!3TN
zu%mYdqU&8;E=w`Nz#qy?sF7KTkrwQE6qfRp;9n42GadDG0LHS(b38$ijK<J$)19o*
z;S~Sv1_fI@<dtG2-edAnYUX#*rMnZqYZn`BszN9P^G2tq)h{16%h#VS#^(3Wvlg}H
z@j%(8WQF8u&a|0z4<K&qw5Uq6g5{|@FRpC_!)OQNsb5{n@>-}`$<kmNN7<{(_lu98
z);Fp;I(+@sC$VhG43G$cPRXS421!TdOl9fh^i15apI76P;__=z-W(k+F3wIbk3H1q
znamDm2Y#^-hGon!@O=N^GKFJdL6TP)!^Tj`gR860f>WLt(65^6izwwCGqNgE@VBZk
zC#*CSntUdifL8k22s-4F<yv4USk_$08aHCRyC#?Q=$lXU<5aA_r3gtTHI>gfrJbT+
zGRHkDR^-C`NLyd<s<2z!t;B1Z$Z}mtF49_wrMyKiv)OzxIr_<N&gEJZRfbovO*OnH
z+rL2Ayhv@NiN6cGs15ZLC6%<75Zs<`JUWYB$-1`1_4G(Au{EUNnC)uxH^m;g)eev1
zobN)0dEdbfbAKNi<;Whas{tMJz7BNE5iQuY_oook1lk?b1#9png6`<m28-;`2Qv0+
z1eqf`(XQ`l1zDb^7Z%#18DxCAZV)`C9b^c3;q-&n`!s}%0TZ@5LY6@-LBs<Q;2$Io
z2*`?Q&{@@?DlBjP=Tf&)X)43=)Jw_4xo8yW$jkNQCDfVT1C5_{UW1pOku9BdbJeQX
z(}-Hvx#U(RmjdKRz}roV=xL8<g7mLs4(zjHzhdfIq^yC&U?*pJzHwR;LQ}rsIlxN3
zs!)2`8RFQUlCT^Hjyz=sBg-mF1-+B4#vurzTbRfI2%dIQi;O9q5Hzgp1ehEiPiB+(
z^l$(P<X0Fjp7@iwn6ZscVYZQZnl;^_g3cCsO6bs|1n#2e$d)NkZR&{I-_G>qU*_h`
zMOX%yp^9w}IF~z;ZC9<F+t2uaZ19_Ji)Mj|%Ry2KZ}@qAa`x-liSO*dTMr$bn=LQG
z=1npC;4}_g!+_epKid$HGUEoGNU#~z&_f<t(SCic#5GKHX`|Woei=MGVFf-&;AlP`
z(-`b6_NOO8s$sUYBMEda)VCdfLj3McPA7|FNAfN#GEj#AIDoxwya2fH>Fvq->h65L
zIM;vf-4cRJBh;FaijZdSRxiNps!td<iOn4$0Q?M=7wo0vU%c|NvTPu$NH*Ixpc+RI
zwW_klPI~x}Zeg~Vy%XmBX?+{>X{1odfUaKn^b<0JRMS+|hk?OeFDq3%);2~-5OODC
zNcsM_)PSkk)Yye^!yvdCzGb;7%BL4RTy`n>+AvTN`VzIz#*jSdHlhuk0QSwYp54pk
z!o=S%XWW)4c*UG8`j$Cc@S=s863z7w;nMd*nFp6L(3*WM8N9(^#GrMOh`{tq%M(PU
zUrwGXB#%l6jDq{$#_hEu%jvt=W3n+U7_Buf6$6zRl848HA*j}#BqaYq3@pzhbQ~6d
z#5_uUfILom_yY;NHv@DJdpb_>WN;F}?<ft*jc?Sgb|!}11|!}0Mev}x<n6rGRX=C)
qQPJqM<Nup<JA-XI@8bDnxvYZf(wT8BUBg5Pe`uoN)&ZV9Jo^_aAqQ&!

literal 0
HcmV?d00001

diff --git a/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Subscription.create.1.json b/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Subscription.create.1.json
new file mode 100644
index 0000000000000000000000000000000000000000..b70a10187b35b181e12ae565c739d01f164a59e8
GIT binary patch
literal 2134
zcma)8+invv5Pk1gM1DpzOHwsKLOirc6j3TJLR^HbiPuS7yxzr^kfrLsGxlEMy(EyA
zWXI$2nKS2j^Kdqq5GV>M7+8@jy5^h~Tr;jLc|K82$|pW$C8QK;gCWAUpf{X?vw4Pl
z7)V)?IEk{7NlZ{|n`_*WT+Eh>#k1MPWyoT<z$FFi&k=b_xk@o>4bt!^fv1=fLtvVN
z<vz7v&}ofuyXBIL%VeG`+C#fJ#)9_62bByq#XV@koT1nG>(Ax-)wlOk`|f^THJL(b
zs8d!*nmQf>Ood@NuEa6yZP1ADJrLtoq5l5ut@-lR{=Ru%)fbj$1`{5Tb|gLp3;6Us
zJWc9oSQ+7C;rXjRq&`K2LvGkzadrFV_R5As>XeLIsOvvGMqBgMJ!ifR57IC#iXaV-
zEZ$y7P%Y59Brq#>o)xQIm}U(JMYh>!zQGAnXJ8W(cSy-<`WDma^nm9eKWf;PXMQh1
z?cfwd+z;mUIGH8O%cN6?1s$-`mvAPH+QHowWxg#WZMMJKt^V9CmUreuFHKplcOZR@
zl7k*!rHvN403_0r<*DzXReVdpk%1sICD=~|RqLRX!_zx`9Yz+W(pf8Xp1NwD{%7cI
zzMOyL_S1E-@7A$`Yp=e>_${=sKx^c~RSn9lbDbR@uGIo$<56#-u~ULHs4a^yW4x5O
zGHCf$)v-!{IY1X$KgwA5v1D;+%x87E$MF55;)-m+V0*eZ7;+$13e%{K*xX_>y$KVi
zgC@>*$$5-|21~z;Loe{5?|wuR+9P8UAp>bd$l}UjoTOt-GGfY;b|f$~V)F(#Zow1g
z!^_lP(S6(f({MzLTdj=`Mli-5+GoJtDN9AnMrI=aWg{{)P!$?lhu9OQ!NpT{!Mh9Z
x&{3mQ8tR*a9C_nm*g9{;MkL-1#KJ!M6EJ-mF5?<f^|o$qfI8Sz_u;e0v%kt#R{;P3

literal 0
HcmV?d00001

diff --git a/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Token.create.1.json b/corporate/tests/stripe_fixtures/upgrade_with_outdated_seat_count:Token.create.1.json
new file mode 100644
index 0000000000000000000000000000000000000000..0ff96f1c56723fcb5e966440f23fc12e2a10b78f
GIT binary patch
literal 834
zcmaJ<O-}+b5WVv&Ha!!<et_c5i1A=ZAfO>$He)-mmEA73T@Z=?-A<Q9MZ%uCZ{ECl
zuhV@i2p9(~*iEo^XZHs}Xf!6}((W9}#=zx5a@Ia6mzA>GGoF;RD1xa4i{_M<ONAln
zJSl-Xuo(shp?#K?@(lTk$d&R(6z6!6W2h?6PaGMVf4=l7*Q6TLcdF=W7v{cdP;@!$
zSsG|s`LFELBe>xgbi__UA$gjEvB_VP__0olQrXPG@gWmoI|S{Zs2exvLaHU|wU)|~
zrM|eG&j!ygo2@SUz5B<;$)ZxiF^R%83Tc~y^hs#lX*e9=79O(hT`_+z)VALnOh&``
zRYPrjvLs5P1}xBm01Hle|8;QcV$r3uTLJU}v~I}d>l<?K)4#6+-Igm<@)N8qRqFJz
zl04Bi-ShIAjOP-SP3x6~-K$R2jXGhHbfU0c9;I@trpB-r53aAHxYs9rRtI!5{^eU%
r)8Tk9n|OCDmm4ffLB<!58}!XThP}y}X?JTM@0fvA#!vQrt*_QMr%vrE

literal 0
HcmV?d00001

diff --git a/corporate/tests/test_stripe.py b/corporate/tests/test_stripe.py
index cc1792f4ce..fcfa82e9ca 100644
--- a/corporate/tests/test_stripe.py
+++ b/corporate/tests/test_stripe.py
@@ -282,40 +282,39 @@ class StripeTest(ZulipTestCase):
         response = self.client_get("/billing/")
         self.assert_in_success_response(["You must be an organization administrator"], response)
 
-    @patch("stripe.Customer.create", side_effect=mock_create_customer)
-    @patch("stripe.Subscription.create", side_effect=mock_create_subscription)
-    def test_upgrade_with_outdated_seat_count(self, mock_create_subscription: Mock,
-                                              mock_create_customer: Mock) -> None:
+    @mock_stripe("stripe.Token.create")
+    @mock_stripe("stripe.Customer.create")
+    @mock_stripe("stripe.Subscription.create")
+    @mock_stripe("stripe.Customer.retrieve")
+    def test_upgrade_with_outdated_seat_count(
+            self, mock4: Mock, mock3: Mock, mock2: Mock, mock1: Mock) -> None:
         self.login(self.example_email("hamlet"))
         new_seat_count = 123
         # Change the seat count while the user is going through the upgrade flow
         response = self.client_get("/upgrade/")
         with patch('corporate.lib.stripe.get_seat_count', return_value=new_seat_count):
             self.client_post("/upgrade/", {
-                'stripeToken': self.token,
+                'stripeToken': stripe_create_token().id,
                 'signed_seat_count': self.get_signed_seat_count_from_response(response),
                 'salt': self.get_salt_from_response(response),
                 'plan': Plan.CLOUD_ANNUAL})
         # Check that the subscription call used the old quantity, not new_seat_count
-        mock_create_subscription.assert_called_once_with(
-            customer=self.stripe_customer_id,
-            billing='charge_automatically',
-            items=[{
-                'plan': self.stripe_plan_id,
-                'quantity': self.quantity,
-            }],
-            prorate=True,
-            tax_percent=0)
+        stripe_customer = stripe_get_customer(
+            Customer.objects.get(realm=get_realm('zulip')).stripe_customer_id)
+        stripe_subscription = extract_current_subscription(stripe_customer)
+        self.assertEqual(stripe_subscription.quantity, self.quantity)
+
         # Check that we have the STRIPE_PLAN_QUANTITY_RESET entry, and that we
         # correctly handled the requires_billing_update field
         audit_log_entries = list(RealmAuditLog.objects.order_by('-id')
                                  .values_list('event_type', 'event_time',
                                               'requires_billing_update')[:5])[::-1]
         self.assertEqual(audit_log_entries, [
-            (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(self.customer_created), False),
-            (RealmAuditLog.STRIPE_CARD_CHANGED, timestamp_to_datetime(self.customer_created), False),
-            (RealmAuditLog.STRIPE_PLAN_CHANGED, timestamp_to_datetime(self.subscription_created), False),
-            (RealmAuditLog.STRIPE_PLAN_QUANTITY_RESET, timestamp_to_datetime(self.subscription_created), True),
+            (RealmAuditLog.STRIPE_CUSTOMER_CREATED, timestamp_to_datetime(stripe_customer.created), False),
+            (RealmAuditLog.STRIPE_CARD_CHANGED, timestamp_to_datetime(stripe_customer.created), False),
+            # TODO: Ideally this test would force stripe_customer.created != stripe_subscription.created
+            (RealmAuditLog.STRIPE_PLAN_CHANGED, timestamp_to_datetime(stripe_subscription.created), False),
+            (RealmAuditLog.STRIPE_PLAN_QUANTITY_RESET, timestamp_to_datetime(stripe_subscription.created), True),
             (RealmAuditLog.REALM_PLAN_TYPE_CHANGED, Kandra(), False),
         ])
         self.assertEqual(ujson.loads(RealmAuditLog.objects.filter(