summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-08-30 18:46:21 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-08-30 18:46:21 -0400
commit7d7f0a2954a524049d9faa167d13e2aebf16fc5f (patch)
tree08b6770ad09854a75e5c385ac29354c7f363d337 /spec/lib
parente42388f83cef283aef31d59cc72ea288ddb509fd (diff)
downloadgitlab-ci-7d7f0a2954a524049d9faa167d13e2aebf16fc5f.tar.gz
Use `eq` instead of `==` in matchers
Diffstat (limited to 'spec/lib')
-rw-r--r--spec/lib/ansi2html_spec.rb66
-rw-r--r--spec/lib/charts_spec.rb2
-rw-r--r--spec/lib/gitlab_ci_yaml_processor_spec.rb36
-rw-r--r--spec/lib/upgrader_spec.rb2
4 files changed, 53 insertions, 53 deletions
diff --git a/spec/lib/ansi2html_spec.rb b/spec/lib/ansi2html_spec.rb
index aa60011..e8dc107 100644
--- a/spec/lib/ansi2html_spec.rb
+++ b/spec/lib/ansi2html_spec.rb
@@ -3,131 +3,131 @@ require 'spec_helper'
describe Ansi2html do
it "prints non-ansi as-is" do
- Ansi2html::convert("Hello").should == 'Hello'
+ Ansi2html::convert("Hello").should eq 'Hello'
end
it "strips non-color-changing controll sequences" do
- Ansi2html::convert("Hello \e[2Kworld").should == 'Hello world'
+ Ansi2html::convert("Hello \e[2Kworld").should eq 'Hello world'
end
it "prints simply red" do
- Ansi2html::convert("\e[31mHello\e[0m").should == '<span class="term-fg-red">Hello</span>'
+ Ansi2html::convert("\e[31mHello\e[0m").should eq '<span class="term-fg-red">Hello</span>'
end
it "prints simply red without trailing reset" do
- Ansi2html::convert("\e[31mHello").should == '<span class="term-fg-red">Hello</span>'
+ Ansi2html::convert("\e[31mHello").should eq '<span class="term-fg-red">Hello</span>'
end
it "prints simply yellow" do
- Ansi2html::convert("\e[33mHello\e[0m").should == '<span class="term-fg-yellow">Hello</span>'
+ Ansi2html::convert("\e[33mHello\e[0m").should eq '<span class="term-fg-yellow">Hello</span>'
end
it "prints default on blue" do
- Ansi2html::convert("\e[39;44mHello").should == '<span class="term-bg-blue">Hello</span>'
+ Ansi2html::convert("\e[39;44mHello").should eq '<span class="term-bg-blue">Hello</span>'
end
it "prints red on blue" do
- Ansi2html::convert("\e[31;44mHello").should == '<span class="term-fg-red term-bg-blue">Hello</span>'
+ Ansi2html::convert("\e[31;44mHello").should eq '<span class="term-fg-red term-bg-blue">Hello</span>'
end
it "resets colors after red on blue" do
- Ansi2html::convert("\e[31;44mHello\e[0m world").should == '<span class="term-fg-red term-bg-blue">Hello</span> world'
+ Ansi2html::convert("\e[31;44mHello\e[0m world").should eq '<span class="term-fg-red term-bg-blue">Hello</span> world'
end
it "performs color change from red/blue to yellow/blue" do
- Ansi2html::convert("\e[31;44mHello \e[33mworld").should == '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>'
+ Ansi2html::convert("\e[31;44mHello \e[33mworld").should eq '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-blue">world</span>'
end
it "performs color change from red/blue to yellow/green" do
- Ansi2html::convert("\e[31;44mHello \e[33;42mworld").should == '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>'
+ Ansi2html::convert("\e[31;44mHello \e[33;42mworld").should eq '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-fg-yellow term-bg-green">world</span>'
end
it "performs color change from red/blue to reset to yellow/green" do
- Ansi2html::convert("\e[31;44mHello\e[0m \e[33;42mworld").should == '<span class="term-fg-red term-bg-blue">Hello</span> <span class="term-fg-yellow term-bg-green">world</span>'
+ Ansi2html::convert("\e[31;44mHello\e[0m \e[33;42mworld").should eq '<span class="term-fg-red term-bg-blue">Hello</span> <span class="term-fg-yellow term-bg-green">world</span>'
end
it "ignores unsupported codes" do
- Ansi2html::convert("\e[51mHello\e[0m").should == 'Hello'
+ Ansi2html::convert("\e[51mHello\e[0m").should eq 'Hello'
end
it "prints light red" do
- Ansi2html::convert("\e[91mHello\e[0m").should == '<span class="term-fg-l-red">Hello</span>'
+ Ansi2html::convert("\e[91mHello\e[0m").should eq '<span class="term-fg-l-red">Hello</span>'
end
it "prints default on light red" do
- Ansi2html::convert("\e[101mHello\e[0m").should == '<span class="term-bg-l-red">Hello</span>'
+ Ansi2html::convert("\e[101mHello\e[0m").should eq '<span class="term-bg-l-red">Hello</span>'
end
it "performs color change from red/blue to default/blue" do
- Ansi2html::convert("\e[31;44mHello \e[39mworld").should == '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>'
+ Ansi2html::convert("\e[31;44mHello \e[39mworld").should eq '<span class="term-fg-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>'
end
it "performs color change from light red/blue to default/blue" do
- Ansi2html::convert("\e[91;44mHello \e[39mworld").should == '<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>'
+ Ansi2html::convert("\e[91;44mHello \e[39mworld").should eq '<span class="term-fg-l-red term-bg-blue">Hello </span><span class="term-bg-blue">world</span>'
end
it "prints bold text" do
- Ansi2html::convert("\e[1mHello").should == '<span class="term-bold">Hello</span>'
+ Ansi2html::convert("\e[1mHello").should eq '<span class="term-bold">Hello</span>'
end
it "resets bold text" do
- Ansi2html::convert("\e[1mHello\e[21m world").should == '<span class="term-bold">Hello</span> world'
- Ansi2html::convert("\e[1mHello\e[22m world").should == '<span class="term-bold">Hello</span> world'
+ Ansi2html::convert("\e[1mHello\e[21m world").should eq '<span class="term-bold">Hello</span> world'
+ Ansi2html::convert("\e[1mHello\e[22m world").should eq '<span class="term-bold">Hello</span> world'
end
it "prints italic text" do
- Ansi2html::convert("\e[3mHello").should == '<span class="term-italic">Hello</span>'
+ Ansi2html::convert("\e[3mHello").should eq '<span class="term-italic">Hello</span>'
end
it "resets italic text" do
- Ansi2html::convert("\e[3mHello\e[23m world").should == '<span class="term-italic">Hello</span> world'
+ Ansi2html::convert("\e[3mHello\e[23m world").should eq '<span class="term-italic">Hello</span> world'
end
it "prints underlined text" do
- Ansi2html::convert("\e[4mHello").should == '<span class="term-underline">Hello</span>'
+ Ansi2html::convert("\e[4mHello").should eq '<span class="term-underline">Hello</span>'
end
it "resets underlined text" do
- Ansi2html::convert("\e[4mHello\e[24m world").should == '<span class="term-underline">Hello</span> world'
+ Ansi2html::convert("\e[4mHello\e[24m world").should eq '<span class="term-underline">Hello</span> world'
end
it "prints concealed text" do
- Ansi2html::convert("\e[8mHello").should == '<span class="term-conceal">Hello</span>'
+ Ansi2html::convert("\e[8mHello").should eq '<span class="term-conceal">Hello</span>'
end
it "resets concealed text" do
- Ansi2html::convert("\e[8mHello\e[28m world").should == '<span class="term-conceal">Hello</span> world'
+ Ansi2html::convert("\e[8mHello\e[28m world").should eq '<span class="term-conceal">Hello</span> world'
end
it "prints crossed-out text" do
- Ansi2html::convert("\e[9mHello").should == '<span class="term-cross">Hello</span>'
+ Ansi2html::convert("\e[9mHello").should eq '<span class="term-cross">Hello</span>'
end
it "resets crossed-out text" do
- Ansi2html::convert("\e[9mHello\e[29m world").should == '<span class="term-cross">Hello</span> world'
+ Ansi2html::convert("\e[9mHello\e[29m world").should eq '<span class="term-cross">Hello</span> world'
end
it "can print 256 xterm fg colors" do
- Ansi2html::convert("\e[38;5;16mHello").should == '<span class="xterm-fg-16">Hello</span>'
+ Ansi2html::convert("\e[38;5;16mHello").should eq '<span class="xterm-fg-16">Hello</span>'
end
it "can print 256 xterm fg colors on normal magenta background" do
- Ansi2html::convert("\e[38;5;16;45mHello").should == '<span class="xterm-fg-16 term-bg-magenta">Hello</span>'
+ Ansi2html::convert("\e[38;5;16;45mHello").should eq '<span class="xterm-fg-16 term-bg-magenta">Hello</span>'
end
it "can print 256 xterm bg colors" do
- Ansi2html::convert("\e[48;5;240mHello").should == '<span class="xterm-bg-240">Hello</span>'
+ Ansi2html::convert("\e[48;5;240mHello").should eq '<span class="xterm-bg-240">Hello</span>'
end
it "can print 256 xterm bg colors on normal magenta foreground" do
- Ansi2html::convert("\e[48;5;16;35mHello").should == '<span class="term-fg-magenta xterm-bg-16">Hello</span>'
+ Ansi2html::convert("\e[48;5;16;35mHello").should eq '<span class="term-fg-magenta xterm-bg-16">Hello</span>'
end
it "prints bold colored text vividly" do
- Ansi2html::convert("\e[1;31mHello\e[0m").should == '<span class="term-fg-l-red term-bold">Hello</span>'
+ Ansi2html::convert("\e[1;31mHello\e[0m").should eq '<span class="term-fg-l-red term-bold">Hello</span>'
end
it "prints bold light colored text correctly" do
- Ansi2html::convert("\e[1;91mHello\e[0m").should == '<span class="term-fg-l-red term-bold">Hello</span>'
+ Ansi2html::convert("\e[1;91mHello\e[0m").should eq '<span class="term-fg-l-red term-bold">Hello</span>'
end
end
diff --git a/spec/lib/charts_spec.rb b/spec/lib/charts_spec.rb
index 236cfc2..d3c78b6 100644
--- a/spec/lib/charts_spec.rb
+++ b/spec/lib/charts_spec.rb
@@ -11,7 +11,7 @@ describe "Charts" do
it 'should return build times in minutes' do
chart = Charts::BuildTime.new(@project)
- chart.build_times.should == [2]
+ chart.build_times.should eq [2]
end
end
end
diff --git a/spec/lib/gitlab_ci_yaml_processor_spec.rb b/spec/lib/gitlab_ci_yaml_processor_spec.rb
index ed3d4e8..054e039 100644
--- a/spec/lib/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/gitlab_ci_yaml_processor_spec.rb
@@ -13,8 +13,8 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should == 1
- config_processor.builds_for_stage_and_ref(type, "master").first.should == {
+ config_processor.builds_for_stage_and_ref(type, "master").size.should eq 1
+ config_processor.builds_for_stage_and_ref(type, "master").first.should eq({
stage: "test",
except: nil,
name: :rspec,
@@ -23,7 +23,7 @@ describe GitlabCiYamlProcessor do
tags: [],
options: {},
allow_failure: false
- }
+ })
end
it "does not return builds if only has another branch" do
@@ -34,7 +34,7 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should == 0
+ config_processor.builds_for_stage_and_ref(type, "master").size.should eq 0
end
it "does not return builds if only has regexp with another branch" do
@@ -45,7 +45,7 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should == 0
+ config_processor.builds_for_stage_and_ref(type, "master").size.should eq 0
end
it "returns builds if only has specified this branch" do
@@ -56,7 +56,7 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should == 1
+ config_processor.builds_for_stage_and_ref(type, "master").size.should eq 1
end
it "does not build tags" do
@@ -67,7 +67,7 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "0-1", true).size.should == 0
+ config_processor.builds_for_stage_and_ref(type, "0-1", true).size.should eq 0
end
it "returns builds if only has a list of branches including specified" do
@@ -78,7 +78,7 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref(type, "deploy").size.should == 1
+ config_processor.builds_for_stage_and_ref(type, "deploy").size.should eq 1
end
it "returns build only for specified type" do
@@ -93,9 +93,9 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref("production", "deploy").size.should == 0
- config_processor.builds_for_stage_and_ref(type, "deploy").size.should == 1
- config_processor.builds_for_stage_and_ref("deploy", "deploy").size.should == 2
+ config_processor.builds_for_stage_and_ref("production", "deploy").size.should eq 0
+ config_processor.builds_for_stage_and_ref(type, "deploy").size.should eq 1
+ config_processor.builds_for_stage_and_ref("deploy", "deploy").size.should eq 2
end
end
@@ -110,8 +110,8 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref("test", "master").size.should == 1
- config_processor.builds_for_stage_and_ref("test", "master").first.should == {
+ config_processor.builds_for_stage_and_ref("test", "master").size.should eq 1
+ config_processor.builds_for_stage_and_ref("test", "master").first.should eq({
except: nil,
stage: "test",
name: :rspec,
@@ -123,7 +123,7 @@ describe GitlabCiYamlProcessor do
services: ["mysql"]
},
allow_failure: false
- }
+ })
end
it "returns image and service when overridden for job" do
@@ -136,8 +136,8 @@ describe GitlabCiYamlProcessor do
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.builds_for_stage_and_ref("test", "master").size.should == 1
- config_processor.builds_for_stage_and_ref("test", "master").first.should == {
+ config_processor.builds_for_stage_and_ref("test", "master").size.should eq 1
+ config_processor.builds_for_stage_and_ref("test", "master").first.should eq({
except: nil,
stage: "test",
name: :rspec,
@@ -149,7 +149,7 @@ describe GitlabCiYamlProcessor do
services: ["postgresql"]
},
allow_failure: false
- }
+ })
end
end
@@ -166,7 +166,7 @@ describe GitlabCiYamlProcessor do
})
config_processor = GitlabCiYamlProcessor.new(config)
- config_processor.variables.should == variables
+ config_processor.variables.should eq variables
end
end
diff --git a/spec/lib/upgrader_spec.rb b/spec/lib/upgrader_spec.rb
index b1c3651..9d86af0 100644
--- a/spec/lib/upgrader_spec.rb
+++ b/spec/lib/upgrader_spec.rb
@@ -5,7 +5,7 @@ describe Upgrader do
let(:current_version) { GitlabCi::VERSION }
describe 'current_version_raw' do
- it { upgrader.current_version_raw.should == current_version }
+ it { upgrader.current_version_raw.should eq current_version }
end
describe 'latest_version?' do