Skip to content

Commit cd7a2cb

Browse files
authored
run specs on ruby 3.1 (#221)
1 parent 7d500d8 commit cd7a2cb

File tree

2 files changed

+89
-57
lines changed

2 files changed

+89
-57
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ on:
44
pull_request:
55
push:
66
branches:
7-
- master
7+
- main
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
ruby: [ '2.6', '2.7', '3.0' ]
14+
ruby: [ '2.6', '2.7', '3.0', '3.1' ]
1515
name: Lint & Test with Ruby ${{ matrix.ruby }}
1616
steps:
1717
- uses: actions/checkout@v2

spec/kitchen/driver/openstack_spec.rb

+87-55
Original file line numberDiff line numberDiff line change
@@ -552,10 +552,12 @@
552552

553553
it "exact id match" do
554554
expect(servers).to receive(:create).with(
555-
name: "hello",
556-
image_ref: "1e1f4346-e3ea-48ba-9d1b-0002bfcb8981",
557-
flavor_ref: "1",
558-
availability_zone: nil
555+
{
556+
name: "hello",
557+
image_ref: "1e1f4346-e3ea-48ba-9d1b-0002bfcb8981",
558+
flavor_ref: "1",
559+
availability_zone: nil,
560+
}
559561
)
560562
driver.send(:create_server)
561563
end
@@ -588,10 +590,12 @@
588590

589591
it "exact id match" do
590592
expect(servers).to receive(:create).with(
591-
name: "hello",
592-
flavor_ref: "1e1f4346-e3ea-48ba-9d1b-0002bfcb8981",
593-
image_ref: "111",
594-
availability_zone: nil
593+
{
594+
name: "hello",
595+
flavor_ref: "1e1f4346-e3ea-48ba-9d1b-0002bfcb8981",
596+
image_ref: "111",
597+
availability_zone: nil,
598+
}
595599
)
596600
driver.send(:create_server)
597601
end
@@ -623,10 +627,14 @@
623627
end
624628

625629
it "exact id match" do
626-
expect(servers).to receive(:create).with(name: "hello",
627-
image_ref: "111",
628-
flavor_ref: "1",
629-
availability_zone: nil)
630+
expect(servers).to receive(:create).with(
631+
{
632+
name: "hello",
633+
image_ref: "111",
634+
flavor_ref: "1",
635+
availability_zone: nil,
636+
}
637+
)
630638
driver.send(:create_server)
631639
end
632640
end
@@ -641,10 +649,14 @@
641649
end
642650

643651
it "exact name match" do
644-
expect(servers).to receive(:create).with(name: "hello",
645-
image_ref: "222",
646-
flavor_ref: "2",
647-
availability_zone: nil)
652+
expect(servers).to receive(:create).with(
653+
{
654+
name: "hello",
655+
image_ref: "222",
656+
flavor_ref: "2",
657+
availability_zone: nil,
658+
}
659+
)
648660
driver.send(:create_server)
649661
end
650662
end
@@ -660,10 +672,14 @@
660672
end
661673

662674
it "regex name match" do
663-
expect(servers).to receive(:create).with(name: "hello",
664-
image_ref: "222",
665-
flavor_ref: "1",
666-
availability_zone: nil)
675+
expect(servers).to receive(:create).with(
676+
{
677+
name: "hello",
678+
image_ref: "222",
679+
flavor_ref: "1",
680+
availability_zone: nil,
681+
}
682+
)
667683
driver.send(:create_server)
668684
end
669685
end
@@ -682,11 +698,15 @@
682698
networks = [
683699
{ "net_id" => "0922b7aa-0a2f-4e68-8ff7-2886c4fc472d" },
684700
]
685-
expect(servers).to receive(:create).with(name: "hello",
686-
image_ref: "111",
687-
flavor_ref: "1",
688-
availability_zone: nil,
689-
nics: networks)
701+
expect(servers).to receive(:create).with(
702+
{
703+
name: "hello",
704+
image_ref: "111",
705+
flavor_ref: "1",
706+
availability_zone: nil,
707+
nics: networks,
708+
}
709+
)
690710
driver.send(:create_server)
691711
end
692712
end
@@ -723,11 +743,13 @@
723743
{ "net_id" => "1" },
724744
]
725745
expect(servers).to receive(:create).with(
726-
name: "hello",
727-
image_ref: "111",
728-
flavor_ref: "1",
729-
availability_zone: nil,
730-
nics: networks
746+
{
747+
name: "hello",
748+
image_ref: "111",
749+
flavor_ref: "1",
750+
availability_zone: nil,
751+
nics: networks,
752+
}
731753
)
732754
driver.send(:create_server)
733755
end
@@ -748,11 +770,13 @@
748770
{ "net_id" => "1" },
749771
]
750772
expect(servers).to receive(:create).with(
751-
name: "hello",
752-
image_ref: "111",
753-
flavor_ref: "1",
754-
availability_zone: nil,
755-
nics: networks
773+
{
774+
name: "hello",
775+
image_ref: "111",
776+
flavor_ref: "1",
777+
availability_zone: nil,
778+
nics: networks,
779+
}
756780
)
757781
driver.send(:create_server)
758782
end
@@ -774,11 +798,13 @@
774798
{ "net_id" => "2" },
775799
]
776800
expect(servers).to receive(:create).with(
777-
name: "hello",
778-
image_ref: "111",
779-
flavor_ref: "1",
780-
availability_zone: nil,
781-
nics: networks
801+
{
802+
name: "hello",
803+
image_ref: "111",
804+
flavor_ref: "1",
805+
availability_zone: nil,
806+
nics: networks,
807+
}
782808
)
783809
driver.send(:create_server)
784810
end
@@ -802,11 +828,13 @@
802828

803829
it "passes file contents" do
804830
expect(servers).to receive(:create).with(
805-
name: "hello",
806-
image_ref: "111",
807-
flavor_ref: "1",
808-
availability_zone: nil,
809-
user_data: data
831+
{
832+
name: "hello",
833+
image_ref: "111",
834+
flavor_ref: "1",
835+
availability_zone: nil,
836+
user_data: data,
837+
}
810838
)
811839
driver.send(:create_server)
812840
end
@@ -824,11 +852,13 @@
824852

825853
it "enables config drive" do
826854
expect(servers).to receive(:create).with(
827-
name: "hello",
828-
image_ref: "111",
829-
flavor_ref: "1",
830-
availability_zone: nil,
831-
config_drive: true
855+
{
856+
name: "hello",
857+
image_ref: "111",
858+
flavor_ref: "1",
859+
availability_zone: nil,
860+
config_drive: true,
861+
}
832862
)
833863
driver.send(:create_server)
834864
end
@@ -855,11 +885,13 @@
855885

856886
it "passes metadata contents" do
857887
expect(servers).to receive(:create).with(
858-
name: "hello",
859-
image_ref: "111",
860-
flavor_ref: "1",
861-
availability_zone: nil,
862-
metadata: data
888+
{
889+
name: "hello",
890+
image_ref: "111",
891+
flavor_ref: "1",
892+
availability_zone: nil,
893+
metadata: data,
894+
}
863895
)
864896
driver.send(:create_server)
865897
end

0 commit comments

Comments
 (0)