spec/shorthand_spec.rb in distribution-0.7.3 vs spec/shorthand_spec.rb in distribution-0.8.0

@@ -1,34 +1,31 @@
-require File.expand_path(File.dirname(__FILE__)+"/spec_helper.rb")
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 describe Distribution::Shorthand do
   include Distribution::Shorthand
-  it "should have basic methods for all distributions" do
-    [:Normal,:ChiSquare, :F, :Hypergeometric, :Binomial, :T].each do |d|
-      klass=Distribution.const_get(d)
-      shortname=klass::SHORTHAND
-      methods=[:pdf, :cdf, :p_value].map {|m| "#{shortname}_#{m}".to_sym}
-      methods.each do |m| 
-        Distribution::Shorthand.instance_methods.map {|v| v.to_sym}.should include(m)
+  it 'should have basic methods for all distributions' do
+    [:Normal, :ChiSquare, :F, :Hypergeometric, :Binomial, :T].each do |d|
+      klass = Distribution.const_get(d)
+      shortname = klass::SHORTHAND
+      methods = [:pdf, :cdf, :p_value].map { |m| "#{shortname}_#{m}".to_sym }
+      methods.each do |m|
+        expect(Distribution::Shorthand.instance_methods.map(&:to_sym)).to include(m)
       end
     end
-    
   end
-  it "should have exact methods discrete distributions" do
+  it 'should have exact methods discrete distributions' do
     [:Hypergeometric, :Binomial].each do |d|
-      klass=Distribution.const_get(d)
-      shortname=klass::SHORTHAND
-      methods=[:epdf, :ecdf].map {|m| "#{shortname}_#{m}".to_sym}
-      methods.each do |m| 
-        Distribution::Shorthand.instance_methods.map {|v| v.to_sym}.should include(m)
+      klass = Distribution.const_get(d)
+      shortname = klass::SHORTHAND
+      methods = [:epdf, :ecdf].map { |m| "#{shortname}_#{m}".to_sym }
+      methods.each do |m|
+        expect(Distribution::Shorthand.instance_methods.map(&:to_sym)).to include(m)
       end
     end
-    
   end
 
-
-  it "returns same values as long form" do
-    x=rand()
-    norm_cdf(x).should eql(Distribution::Normal.cdf(x))
-    norm_pdf(x).should eql(Distribution::Normal.pdf(x))
-    norm_p_value(x).should eql(Distribution::Normal.p_value(x))
+  it 'returns same values as long form' do
+    x = rand
+    expect(norm_cdf(x)).to eql(Distribution::Normal.cdf(x))
+    expect(norm_pdf(x)).to eql(Distribution::Normal.pdf(x))
+    expect(norm_p_value(x)).to eql(Distribution::Normal.p_value(x))
   end
 end