diff --git a/spec/gemnasium/parser/gemfile_spec.rb b/spec/gemnasium/parser/gemfile_spec.rb index 9ae6ba6..920dae9 100644 --- a/spec/gemnasium/parser/gemfile_spec.rb +++ b/spec/gemnasium/parser/gemfile_spec.rb @@ -29,13 +29,13 @@ def reset it "parses double quotes" do content(%(gem "rake", ">= 0.8.7")) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses single quotes" do content(%(gem 'rake', '>= 0.8.7')) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "ignores mixed quotes" do @@ -46,25 +46,25 @@ def reset it "parses gems with a period in the name" do content(%(gem "pygment.rb", ">= 0.8.7")) dependency.name.should == "pygment.rb" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses non-requirement gems" do content(%(gem "rake")) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0"] + dependency.requirement.should == Gem::Requirement.new([">= 0"]) end it "parses multi-requirement gems" do content(%(gem "rake", ">= 0.8.7", "<= 0.9.2")) dependency.name.should == "rake" - dependency.requirement.as_list.should == ["<= 0.9.2", ">= 0.8.7"] + dependency.requirement.as_list.should == [">= 0.8.7", "<= 0.9.2"] end it "parses gems with options" do content(%(gem "rake", ">= 0.8.7", :require => false)) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "listens for gemspecs" do @@ -278,13 +278,13 @@ def reset it "parses parentheses" do content(%(gem("rake", ">= 0.8.7"))) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses gems followed by inline comments" do content(%(gem "rake", ">= 0.8.7" # Comment)) dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses oddly quoted gems" do diff --git a/spec/gemnasium/parser/gemspec_spec.rb b/spec/gemnasium/parser/gemspec_spec.rb index c6e146a..1b6c985 100644 --- a/spec/gemnasium/parser/gemspec_spec.rb +++ b/spec/gemnasium/parser/gemspec_spec.rb @@ -33,7 +33,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses single quotes" do @@ -43,7 +43,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "ignores mixed quotes" do @@ -62,7 +62,7 @@ def reset end EOF dependency.name.should == "pygment.rb" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses non-requirement gems" do @@ -72,7 +72,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0"] + dependency.requirement.should == Gem::Requirement.new([">= 0"]) end it "parses multi-requirement gems" do @@ -82,7 +82,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == ["<= 0.9.2", ">= 0.8.7"] + dependency.requirement.as_list.should == [">= 0.8.7", "<= 0.9.2"] end it "parses single-element array requirement gems" do @@ -92,7 +92,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses multi-element array requirement gems" do @@ -102,7 +102,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == ["<= 0.9.2", ">= 0.8.7"] + dependency.requirement.as_list.should == [">= 0.8.7", "<= 0.9.2"] end it "parses runtime gems" do @@ -144,7 +144,7 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end it "parses gems followed by inline comments" do @@ -154,6 +154,6 @@ def reset end EOF dependency.name.should == "rake" - dependency.requirement.as_list.should == [">= 0.8.7"] + dependency.requirement.should == Gem::Requirement.new([">= 0.8.7"]) end end