tdiary-contrib 4.0.2.1 → 4.0.3

data/spec/apple_webclip_spec.rb

@@ -15,7 +15,7 @@ describe "apple_webclip plugin" do
 		end
 			
 		it "header include url" do 
-			@header_snippet.should == %Q|\t<link rel="apple-touch-icon" href="http://example.com/example.png">|
+			expect(@header_snippet).to eq(%Q|\t<link rel="apple-touch-icon" href="http://example.com/example.png">|)
 		end
 	end
 
@@ -27,7 +27,7 @@ describe "apple_webclip plugin" do
 			end
 			
 			it "header is empty" do 
-				@header_snippet.should be_empty
+				expect(@header_snippet).to be_empty
 			end
 		end
 
@@ -38,7 +38,7 @@ describe "apple_webclip plugin" do
 			end
 			
 			it "header is empty" do 
-				@header_snippet.should be_empty
+				expect(@header_snippet).to be_empty
 			end
 		end
 	end

data/spec/gist_spec.rb

@@ -11,6 +11,6 @@ describe "gist plugin" do
 <div class="gist_plugin"><script src="http://gist.github.com/1234567890.js"></script>
 <noscript><a href="http://gist.github.com/1234567890">gist:1234567890</a></noscript></div>
 		EOS
-		snippet.should == expected
+		expect(snippet).to eq(expected)
 	end
 end

data/spec/github_link_spec.rb

@@ -9,7 +9,7 @@ describe "github link plugin" do
 		let(:args) { ['tdiary/tdiary-contrib'] }
 
 		it 'should render repository a tag' do
-			should == %(<a href='https://github.com/tdiary/tdiary-contrib'>tdiary-contrib</a>)
+			is_expected.to eq(%(<a href='https://github.com/tdiary/tdiary-contrib'>tdiary-contrib</a>))
 		end
 	end
 
@@ -17,7 +17,7 @@ describe "github link plugin" do
 		let(:args) { ['tdiary/tdiary-contrib#100'] }
 
 		it 'should render issues a tag' do
-			should == %(<a href='https://github.com/tdiary/tdiary-contrib/issues/100'>tdiary-contrib#100</a>)
+			is_expected.to eq(%(<a href='https://github.com/tdiary/tdiary-contrib/issues/100'>tdiary-contrib#100</a>))
 		end
 	end
   context "When given altenative text" do
@@ -26,13 +26,13 @@ describe "github link plugin" do
     let(:args) { [github_identifier, text] }
 
 		it 'should render repository a tag with the specified text' do
-			should == %(<a href='https://github.com/#{github_identifier}'>#{text}</a>)
+			is_expected.to eq(%(<a href='https://github.com/#{github_identifier}'>#{text}</a>))
 		end
     context "but the text is including <script>" do
       let(:text) { '<script>alert("hoge");</script>' }
 
       it 'should render a link text after sanitizing.' do
-        should_not == %(<a href='https://github.com/#{github_identifier}'>#{text}</a>)
+        is_expected.not_to eq(%(<a href='https://github.com/#{github_identifier}'>#{text}</a>))
       end
     end
   end

data/spec/google_analytics_spec.rb

@@ -16,7 +16,7 @@ describe "google_analytics plugin" do
 
 		it "for footer" do
 			snippet = @plugin.footer_proc
-			snippet.should == expected_html_footer_snippet
+			expect(snippet).to eq(expected_html_footer_snippet)
 		end
 	end
 
@@ -27,7 +27,7 @@ describe "google_analytics plugin" do
 
 		it "for footer" do
 			snippet = @plugin.footer_proc
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 	end
 
@@ -38,7 +38,7 @@ describe "google_analytics plugin" do
 
 		it "for footer" do
 			snippet = @plugin.footer_proc
-			snippet.should be_empty
+			expect(snippet).to be_empty
 		end
 	end
 

data/spec/jdate_spec.rb

@@ -14,7 +14,7 @@ describe "jdate plugin" do
     '20080126' => '土',
     '20080127' => '日',
   }.each do |k,v|
-    it { setup_jdate_plugin(Time.parse(k)).date.strftime('%J').should == v }
+    it { expect(setup_jdate_plugin(Time.parse(k)).date.strftime('%J')).to eq(v) }
   end
 
   def setup_jdate_plugin(date)

data/spec/jmonth_spec.rb

@@ -19,7 +19,7 @@ describe "jmonth plugin" do
     '2007/11/01' => '霜月',
     '2007/12/01' => '師走'
   }.each do |k,v|
-    it { setup_jmonth_plugin(Time.parse(k)).date.strftime('%i').should == v }
+    it { expect(setup_jmonth_plugin(Time.parse(k)).date.strftime('%i')).to eq(v) }
   end
 
   def setup_jmonth_plugin(date)

data/spec/jyear_spec.rb

@@ -12,7 +12,7 @@ describe "jyear plugin" do
     '1989/01/08' => '平成元年',
     '1990/01/01' => '平成2',
   }.each do |k,v|
-    it { setup_jyear_plugin(Time.parse(k)).date.strftime('%K').should == v }
+    it { expect(setup_jyear_plugin(Time.parse(k)).date.strftime('%K')).to eq(v) }
   end
 
   def setup_jyear_plugin(date)

data/spec/my_hotentry_spec.rb

@@ -29,17 +29,17 @@ describe "MyHotEntry" do
 		end
 
 		it "キャッシュファイルが生成されていること" do
-			File.should be_file(@dbfile)
+			expect(File).to be_file(@dbfile)
 		end
 
 		it "人気の日記が取得できていること" do
-			@entries.size.should > 0
+			expect(@entries.size).to be > 0
 		end
 
 		it "取得したエントリにbase_urlとタイトルが含まれていること" do
 			@entries.each do |entry|
-				entry[:url].should be_include(@base_url)
-				entry[:title].size.should > 0
+				expect(entry[:url]).to be_include(@base_url)
+				expect(entry[:title].size).to be > 0
 			end
 		end
 	end
@@ -53,7 +53,7 @@ describe "MyHotEntry" do
 		end
 
 		it "キャッシュサイズが大きくならないこと" do
-			@entry_size.should == @original_entry_size
+			expect(@entry_size).to eq(@original_entry_size)
 		end
 	end
 
@@ -65,14 +65,14 @@ describe "MyHotEntry" do
 
 		it "キャッシュをクリアしないこと" do
 			@hotentry.update(@empty_url)
-			@hotentry.entries.size.should == 0
+			expect(@hotentry.entries.size).to eq(0)
 
 			@hotentry.update(@exist_url)
-			@hotentry.entries.size.should > 0
+			expect(@hotentry.entries.size).to be > 0
 			exist_size = @hotentry.entries.size
 
 			@hotentry.update(@empty_url)
-			@hotentry.entries.size.should == exist_size
+			expect(@hotentry.entries.size).to eq(exist_size)
 		end
 	end
 end

data/spec/openid_spec.rb

@@ -16,11 +16,11 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'https://www.hatena.ne.jp/openid/server')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.delegate',
 				:href => 'http://www.hatena.ne.jp/tdtds/')}
 	end
@@ -31,11 +31,11 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'http://auth.livedoor.com/openid/server')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 			:rel => 'openid.delegate',
 			:href => 'http://profile.livedoor.com/tdtds')}
 	end
@@ -46,11 +46,11 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'http://www.livejournal.com/openid/server.bml')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.delegate',
 				:href => 'http://tdtds.livejournal.com/')}
 
@@ -62,15 +62,15 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'http://www.openid.ne.jp/user/auth')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.delegate',
 				:href => 'http://tdtds.openid.ne.jp')}
 
-		it { @header_snippet.should include_xrds_meta_tag_with(
+		it { expect(@header_snippet).to include_xrds_meta_tag_with(
 				:content => 'http://tdtds.openid.ne.jp/user/xrds')}
 
 	end
@@ -81,11 +81,11 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'http://www.typekey.com/t/openid/')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.delegate',
 				:href => 'http://profile.typekey.com/tdtds/')}
 
@@ -97,11 +97,11 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.server',
 				:href => 'http://www.vox.com/services/openid/server')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid.delegate',
 				:href => 'http://tdtds.vox.com/')}
 	end
@@ -112,22 +112,22 @@ describe "openid plugin w/" do
 			@header_snippet = @plugin.header_proc
 		end
 
-		it { @header_snippet.should include_xrds_meta_tag_with(
+		it { expect(@header_snippet).to include_xrds_meta_tag_with(
 				:content => "http://www.myopenid.com/xrds?username=tdtds")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.server",
 				:href => "http://www.myopenid.com/server")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.delegate",
 				:href => "http://tdtds.myopenid.com")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid2.provider",
 				:href => "http://www.myopenid.com/server")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid2.local_id",
 				:href => "http://tdtds.myopenid.com")}
 	end
@@ -138,14 +138,14 @@ describe "openid plugin w/" do
 			@header_snippet = @plugin.header_proc
 		end
 
-		it { @header_snippet.should include_xrds_meta_tag_with(
+		it { expect(@header_snippet).to include_xrds_meta_tag_with(
 				:content => "http://claimid.com/tdtds/xrds")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.server",
 				:href => "http://openid.claimid.com/server")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.delegate",
 				:href => "http://openid.claimid.com/tdtds")}
 	end
@@ -156,22 +156,22 @@ describe "openid plugin w/" do
 			@header_snippet = @plugin.header_proc
 		end
 
-		it { @header_snippet.should include_xrds_meta_tag_with(
+		it { expect(@header_snippet).to include_xrds_meta_tag_with(
 				:content => "http://pip.verisignlabs.com/user/tdtds/yadisxrds")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.server",
 				:href => "http://pip.verisignlabs.com/server")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid.delegate",
 				:href => "http://tdtds.pip.verisignlabs.com/")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid2.provider",
 				:href => "http://pip.verisignlabs.com/server")}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => "openid2.local_id",
 				:href => "http://tdtds.pip.verisignlabs.com/")}
 	end
@@ -182,18 +182,18 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid2.provider',
 				:href => 'https://open.login.yahooapis.jp/openid/op/auth')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid2.local_id',
 				:href => 'https://me.yahoo.co.jp/a/tdtds')}
 
-		it { @header_snippet.should_not include_link_tag_with(
+		it { expect(@header_snippet).not_to include_link_tag_with(
 				:rel => "openid.server")}
 
-		it { @header_snippet.should_not include_link_tag_with(
+		it { expect(@header_snippet).not_to include_link_tag_with(
 				:rel => "openid.delegate")}
 
 	end
@@ -204,18 +204,18 @@ describe "openid plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid2.provider',
 				:href => 'https://open.login.yahooapis.com/openid/op/auth')}
 
-		it { @header_snippet.should include_link_tag_with(
+		it { expect(@header_snippet).to include_link_tag_with(
 				:rel => 'openid2.local_id',
 				:href => 'https://me.yahoo.com/a/tdtds')}
 
-		it { @header_snippet.should_not include_link_tag_with(
+		it { expect(@header_snippet).not_to include_link_tag_with(
 				:rel => "openid.server")}
 
-		it { @header_snippet.should_not include_link_tag_with(
+		it { expect(@header_snippet).not_to include_link_tag_with(
 				:rel => "openid.delegate")}
 	end
 

data/spec/opensearch_ad_spec.rb

@@ -16,9 +16,9 @@ describe "opensearch_ad plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should == expected_link_tag_with(
+		it { expect(@header_snippet).to eq(expected_link_tag_with(
 				:title => 'OpenSearch',
-				:xml => 'http://example.com/opensearch.xml')}
+				:xml => 'http://example.com/opensearch.xml'))}
 	end
 
 	describe "in latest mode" do
@@ -27,9 +27,9 @@ describe "opensearch_ad plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should == expected_link_tag_with(
+		it { expect(@header_snippet).to eq(expected_link_tag_with(
 				:title => 'OpenSearch',
-				:xml => 'http://example.com/opensearch.xml')}
+				:xml => 'http://example.com/opensearch.xml'))}
 	end
 
 	describe "in edit mode" do
@@ -38,7 +38,7 @@ describe "opensearch_ad plugin w/" do
 			@header_snippet = plugin.header_proc
 		end
 
-		it { @header_snippet.should be_empty }
+		it { expect(@header_snippet).to be_empty }
 	end
 
 	def expected_link_tag_with(options)

data/spec/profile_spec.rb

@@ -7,7 +7,7 @@ describe "Profile::Service" do
   describe "GitHub" do
     before do
       require 'json'
-      Profile::Service::GitHub.any_instance.stub(:fetch).and_return(JSON.parse(File.read("spec/fixtures/github.json")))
+      allow_any_instance_of(Profile::Service::GitHub).to receive(:fetch).and_return(JSON.parse(File.read("spec/fixtures/github.json")))
 
       # workaround for run spec on various environment.
       require 'openssl'
@@ -18,39 +18,39 @@ describe "Profile::Service" do
     end
 
     it "should include name, mail, image properties" do
-      @profile.name.should == "Scott Chacon"
-      @profile.mail.should == "schacon@gmail.com"
-      @profile.image.should == "http://www.gravatar.com/avatar/9375a9529679f1b42b567a640d775e7d.jpg?s=40"
+      expect(@profile.name).to eq("Scott Chacon")
+      expect(@profile.mail).to eq("schacon@gmail.com")
+      expect(@profile.image).to eq("http://www.gravatar.com/avatar/9375a9529679f1b42b567a640d775e7d.jpg?s=40")
     end
   end
 
   describe "Twitter" do
     before do
-      Profile::Service::Twitter.any_instance.stub(:fetch).and_return(REXML::Document.new(File.read("spec/fixtures/twitter.xml")))
+      allow_any_instance_of(Profile::Service::Twitter).to receive(:fetch).and_return(REXML::Document.new(File.read("spec/fixtures/twitter.xml")))
 
       # http://twitter.com/tdiary
       @profile = Profile::Service::Twitter.new("tdiary")
     end
 
     it "should include name, description, image properties" do
-      @profile.name.should == "tDiary.org"
-      @profile.description.should == "tDiaryオフィシャルアカウント"
-      @profile.image.should match(%r{^http://.*\.(png|jpg)$})
+      expect(@profile.name).to eq("tDiary.org")
+      expect(@profile.description).to eq("tDiaryオフィシャルアカウント")
+      expect(@profile.image).to match(%r{^http://.*\.(png|jpg)$})
     end
   end
 
   describe "FriendFeed" do
     before do
-      Profile::Service::FriendFeed.any_instance.stub(:fetch).and_return(REXML::Document.new(File.read("spec/fixtures/friendfeed.xml")))
+      allow_any_instance_of(Profile::Service::FriendFeed).to receive(:fetch).and_return(REXML::Document.new(File.read("spec/fixtures/friendfeed.xml")))
 
       # http://friendfeed.com/api/documentation#summary
       @profile = Profile::Service::FriendFeed.new("bret")
     end
 
     it "should include name, description, image properties" do
-      @profile.name.should == "Bret Taylor"
-      @profile.description.should == "Ex-CTO of Facebook. Previously co-founder and CEO of FriendFeed. Programmer, food lover."
-      @profile.image.should == "http://friendfeed-api.com/v2/picture/bret"
+      expect(@profile.name).to eq("Bret Taylor")
+      expect(@profile.description).to eq("Ex-CTO of Facebook. Previously co-founder and CEO of FriendFeed. Programmer, food lover.")
+      expect(@profile.image).to eq("http://friendfeed-api.com/v2/picture/bret")
     end
   end
 
@@ -62,7 +62,7 @@ describe "Profile::Service" do
     end
 
     it "should include image property" do
-      @profile.image.should == "http://www.gravatar.com/avatar/3b3be63a4c2a439b013787725dfce802.jpg"
+      expect(@profile.image).to eq("http://www.gravatar.com/avatar/3b3be63a4c2a439b013787725dfce802.jpg")
     end
 
     context 'with options' do
@@ -71,7 +71,7 @@ describe "Profile::Service" do
       end
 
       it "should specify size option" do
-        @profile.image.should == "http://www.gravatar.com/avatar/3b3be63a4c2a439b013787725dfce802.jpg?s=40"
+        expect(@profile.image).to eq("http://www.gravatar.com/avatar/3b3be63a4c2a439b013787725dfce802.jpg?s=40")
       end
     end
   end
@@ -82,7 +82,7 @@ describe "Profile::Service" do
     end
 
     it "should include image property" do
-      @profile.image.should == "http://www.hatena.ne.jp/users/km/kmachu/profile.gif"
+      expect(@profile.image).to eq("http://www.hatena.ne.jp/users/km/kmachu/profile.gif")
     end
   end
 end