Merge pull request #3178 from input-output-hk/piotr/adp-1513/adjust-t…

…ests Adjust e2e tests
cardano-foundation · Mar 18, 2022 · a250581 · a250581
2 parents 4e147fc + 7edf13c
commit a250581
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/e2e-windows.yml b/.github/workflows/e2e-windows.yml
@@ -92,4 +92,4 @@ jobs:
     env:
       NETWORK: ${{ github.event.inputs.network || 'testnet' }}
       TESTS_E2E_FIXTURES: ${{ secrets.TESTS_E2E_FIXTURES }}
-      PR: ${{ github.event.inputs.pr || '' }}
+      PR: ${{ github.event.inputs.pr || 'master' }}
diff --git a/test/e2e/spec/e2e_spec.rb b/test/e2e/spec/e2e_spec.rb
@@ -24,6 +24,10 @@
     teardown
   end
 
+  after(:all) do
+    SHELLEY.stake_pools.quit(@target_id, PASS)
+  end
+
   describe "E2E Balance -> Sign -> Submit" do
 
     def run_script(script, payload)
@@ -532,7 +536,7 @@ def run_contract(contract_setup, scripts)
       expect(stake_keys['ours'].first['stake']['quantity']).to eq expected_join_balance
       expect(stake_keys['none']['stake']['quantity']).to eq 0
       expect(stake_keys['ours'].first['delegation']['active']['status']).to eq "not_delegating"
-      expect(stake_keys['ours'].first['delegation']['next'].first['status']).to eq "delegating"
+      expect(stake_keys['ours'].first['delegation']['next'].last['status']).to eq "delegating"
 
       # Quit pool
       quit_pool = [{ "quit" => { "stake_key_index" => "0H" } }]
@@ -579,6 +583,7 @@ def run_contract(contract_setup, scripts)
       expect(stake_keys['none']['stake']['quantity']).to eq 0
       expect(stake_keys['ours'].first['delegation']['active']['status']).to eq "not_delegating"
       expect(stake_keys['ours'].first['delegation']['next'].first['status']).to eq "not_delegating"
+      expect(stake_keys['ours'].first['delegation']['next'].last['status']).to eq "not_delegating"
     end
   end
 
@@ -951,7 +956,7 @@ def run_contract(contract_setup, scripts)
         expect(stake_keys['ours'].first['stake']['quantity']).to eq stake_after_joining
         expect(stake_keys['none']['stake']['quantity']).to eq 0
         expect(stake_keys['ours'].first['delegation']['active']['status']).to eq "not_delegating"
-        expect(stake_keys['ours'].first['delegation']['next'].first['status']).to eq "delegating"
+        expect(stake_keys['ours'].first['delegation']['next'].last['status']).to eq "delegating"
 
         # Quit pool
         puts "Quitting pool: #{pool_id}"
@@ -978,6 +983,7 @@ def run_contract(contract_setup, scripts)
         expect(stake_keys['none']['stake']['quantity']).to eq 0
         expect(stake_keys['ours'].first['delegation']['active']['status']).to eq "not_delegating"
         expect(stake_keys['ours'].first['delegation']['next'].first['status']).to eq "not_delegating"
+        expect(stake_keys['ours'].first['delegation']['next'].last['status']).to eq "not_delegating"
       end
     end