1 files changed, 21 insertions, 4 deletions
diff --git a/spec/requests/api/graphql/project/terraform/states_spec.rb b/spec/requests/api/graphql/project/terraform/states_spec.rb
index 533f913926c..c72af19a7a3 100644
--- a/spec/requests/api/graphql/project/terraform/states_spec.rb
+++ b/spec/requests/api/graphql/project/terraform/states_spec.rb
@@ -6,7 +6,8 @@ RSpec.describe 'query terraform states' do
   include GraphqlHelpers
 
   let_it_be(:project) { create(:project) }
-  let_it_be(:terraform_state) { create(:terraform_state, :locked, project: project) }
+  let_it_be(:terraform_state) { create(:terraform_state, :with_version, :locked, project: project) }
+  let_it_be(:latest_version) { terraform_state.latest_version }
 
   let(:query) do
     graphql_query_for(:project, { fullPath: project.full_path },
@@ -20,6 +21,16 @@ RSpec.describe 'query terraform states' do
           createdAt
           updatedAt
 
+          latestVersion {
+            id
+            createdAt
+            updatedAt
+
+            createdByUser {
+              id
+            }
+          }
+
           lockedByUser {
             id
           }
@@ -37,13 +48,19 @@ RSpec.describe 'query terraform states' do
 
   it 'returns terraform state data', :aggregate_failures do
     state = data.dig('nodes', 0)
+    version = state['latestVersion']
 
     expect(state['id']).to eq(terraform_state.to_global_id.to_s)
     expect(state['name']).to eq(terraform_state.name)
-    expect(state['lockedAt']).to eq(terraform_state.locked_at.strftime('%Y-%m-%dT%H:%M:%SZ'))
-    expect(state['createdAt']).to eq(terraform_state.created_at.strftime('%Y-%m-%dT%H:%M:%SZ'))
-    expect(state['updatedAt']).to eq(terraform_state.updated_at.strftime('%Y-%m-%dT%H:%M:%SZ'))
+    expect(state['lockedAt']).to eq(terraform_state.locked_at.iso8601)
+    expect(state['createdAt']).to eq(terraform_state.created_at.iso8601)
+    expect(state['updatedAt']).to eq(terraform_state.updated_at.iso8601)
     expect(state.dig('lockedByUser', 'id')).to eq(terraform_state.locked_by_user.to_global_id.to_s)
+
+    expect(version['id']).to eq(latest_version.to_global_id.to_s)
+    expect(version['createdAt']).to eq(terraform_state.created_at.iso8601)
+    expect(version['updatedAt']).to eq(terraform_state.updated_at.iso8601)
+    expect(version.dig('createdByUser', 'id')).to eq(latest_version.created_by_user.to_global_id.to_s)
   end
 
   it 'returns count of terraform states' do