summaryrefslogtreecommitdiff
path: root/spec/lib
diff options
context:
space:
mode:
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.rb30
-rw-r--r--spec/lib/upgrader_spec.rb4
4 files changed, 51 insertions, 51 deletions
diff --git a/spec/lib/ansi2html_spec.rb b/spec/lib/ansi2html_spec.rb
index d674c97..db922fc 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
- described_class::convert("Hello").should eq 'Hello'
+ expect(described_class::convert("Hello")).to eq 'Hello'
end
it "strips non-color-changing controll sequences" do
- described_class::convert("Hello \e[2Kworld").should eq 'Hello world'
+ expect(described_class::convert("Hello \e[2Kworld")).to eq 'Hello world'
end
it "prints simply red" do
- described_class::convert("\e[31mHello\e[0m").should eq '<span class="term-fg-red">Hello</span>'
+ expect(described_class::convert("\e[31mHello\e[0m")).to eq '<span class="term-fg-red">Hello</span>'
end
it "prints simply red without trailing reset" do
- described_class::convert("\e[31mHello").should eq '<span class="term-fg-red">Hello</span>'
+ expect(described_class::convert("\e[31mHello")).to eq '<span class="term-fg-red">Hello</span>'
end
it "prints simply yellow" do
- described_class::convert("\e[33mHello\e[0m").should eq '<span class="term-fg-yellow">Hello</span>'
+ expect(described_class::convert("\e[33mHello\e[0m")).to eq '<span class="term-fg-yellow">Hello</span>'
end
it "prints default on blue" do
- described_class::convert("\e[39;44mHello").should eq '<span class="term-bg-blue">Hello</span>'
+ expect(described_class::convert("\e[39;44mHello")).to eq '<span class="term-bg-blue">Hello</span>'
end
it "prints red on blue" do
- described_class::convert("\e[31;44mHello").should eq '<span class="term-fg-red term-bg-blue">Hello</span>'
+ expect(described_class::convert("\e[31;44mHello")).to eq '<span class="term-fg-red term-bg-blue">Hello</span>'
end
it "resets colors after red on blue" do
- described_class::convert("\e[31;44mHello\e[0m world").should eq '<span class="term-fg-red term-bg-blue">Hello</span> world'
+ expect(described_class::convert("\e[31;44mHello\e[0m world")).to eq '<span class="term-fg-red term-bg-blue">Hello</span> world'
end
it "performs color change from red/blue to yellow/blue" do
- described_class::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>'
+ expect(described_class::convert("\e[31;44mHello \e[33mworld")).to 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
- described_class::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>'
+ expect(described_class::convert("\e[31;44mHello \e[33;42mworld")).to 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
- described_class::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>'
+ expect(described_class::convert("\e[31;44mHello\e[0m \e[33;42mworld")).to 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
- described_class::convert("\e[51mHello\e[0m").should eq 'Hello'
+ expect(described_class::convert("\e[51mHello\e[0m")).to eq 'Hello'
end
it "prints light red" do
- described_class::convert("\e[91mHello\e[0m").should eq '<span class="term-fg-l-red">Hello</span>'
+ expect(described_class::convert("\e[91mHello\e[0m")).to eq '<span class="term-fg-l-red">Hello</span>'
end
it "prints default on light red" do
- described_class::convert("\e[101mHello\e[0m").should eq '<span class="term-bg-l-red">Hello</span>'
+ expect(described_class::convert("\e[101mHello\e[0m")).to eq '<span class="term-bg-l-red">Hello</span>'
end
it "performs color change from red/blue to default/blue" do
- described_class::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>'
+ expect(described_class::convert("\e[31;44mHello \e[39mworld")).to 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
- described_class::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>'
+ expect(described_class::convert("\e[91;44mHello \e[39mworld")).to 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
- described_class::convert("\e[1mHello").should eq '<span class="term-bold">Hello</span>'
+ expect(described_class::convert("\e[1mHello")).to eq '<span class="term-bold">Hello</span>'
end
it "resets bold text" do
- described_class::convert("\e[1mHello\e[21m world").should eq '<span class="term-bold">Hello</span> world'
- described_class::convert("\e[1mHello\e[22m world").should eq '<span class="term-bold">Hello</span> world'
+ expect(described_class::convert("\e[1mHello\e[21m world")).to eq '<span class="term-bold">Hello</span> world'
+ expect(described_class::convert("\e[1mHello\e[22m world")).to eq '<span class="term-bold">Hello</span> world'
end
it "prints italic text" do
- described_class::convert("\e[3mHello").should eq '<span class="term-italic">Hello</span>'
+ expect(described_class::convert("\e[3mHello")).to eq '<span class="term-italic">Hello</span>'
end
it "resets italic text" do
- described_class::convert("\e[3mHello\e[23m world").should eq '<span class="term-italic">Hello</span> world'
+ expect(described_class::convert("\e[3mHello\e[23m world")).to eq '<span class="term-italic">Hello</span> world'
end
it "prints underlined text" do
- described_class::convert("\e[4mHello").should eq '<span class="term-underline">Hello</span>'
+ expect(described_class::convert("\e[4mHello")).to eq '<span class="term-underline">Hello</span>'
end
it "resets underlined text" do
- described_class::convert("\e[4mHello\e[24m world").should eq '<span class="term-underline">Hello</span> world'
+ expect(described_class::convert("\e[4mHello\e[24m world")).to eq '<span class="term-underline">Hello</span> world'
end
it "prints concealed text" do
- described_class::convert("\e[8mHello").should eq '<span class="term-conceal">Hello</span>'
+ expect(described_class::convert("\e[8mHello")).to eq '<span class="term-conceal">Hello</span>'
end
it "resets concealed text" do
- described_class::convert("\e[8mHello\e[28m world").should eq '<span class="term-conceal">Hello</span> world'
+ expect(described_class::convert("\e[8mHello\e[28m world")).to eq '<span class="term-conceal">Hello</span> world'
end
it "prints crossed-out text" do
- described_class::convert("\e[9mHello").should eq '<span class="term-cross">Hello</span>'
+ expect(described_class::convert("\e[9mHello")).to eq '<span class="term-cross">Hello</span>'
end
it "resets crossed-out text" do
- described_class::convert("\e[9mHello\e[29m world").should eq '<span class="term-cross">Hello</span> world'
+ expect(described_class::convert("\e[9mHello\e[29m world")).to eq '<span class="term-cross">Hello</span> world'
end
it "can print 256 xterm fg colors" do
- described_class::convert("\e[38;5;16mHello").should eq '<span class="xterm-fg-16">Hello</span>'
+ expect(described_class::convert("\e[38;5;16mHello")).to eq '<span class="xterm-fg-16">Hello</span>'
end
it "can print 256 xterm fg colors on normal magenta background" do
- described_class::convert("\e[38;5;16;45mHello").should eq '<span class="xterm-fg-16 term-bg-magenta">Hello</span>'
+ expect(described_class::convert("\e[38;5;16;45mHello")).to eq '<span class="xterm-fg-16 term-bg-magenta">Hello</span>'
end
it "can print 256 xterm bg colors" do
- described_class::convert("\e[48;5;240mHello").should eq '<span class="xterm-bg-240">Hello</span>'
+ expect(described_class::convert("\e[48;5;240mHello")).to eq '<span class="xterm-bg-240">Hello</span>'
end
it "can print 256 xterm bg colors on normal magenta foreground" do
- described_class::convert("\e[48;5;16;35mHello").should eq '<span class="term-fg-magenta xterm-bg-16">Hello</span>'
+ expect(described_class::convert("\e[48;5;16;35mHello")).to eq '<span class="term-fg-magenta xterm-bg-16">Hello</span>'
end
it "prints bold colored text vividly" do
- described_class::convert("\e[1;31mHello\e[0m").should eq '<span class="term-fg-l-red term-bold">Hello</span>'
+ expect(described_class::convert("\e[1;31mHello\e[0m")).to eq '<span class="term-fg-l-red term-bold">Hello</span>'
end
it "prints bold light colored text correctly" do
- described_class::convert("\e[1;91mHello\e[0m").should eq '<span class="term-fg-l-red term-bold">Hello</span>'
+ expect(described_class::convert("\e[1;91mHello\e[0m")).to 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 60d1b5a..2f27723 100644
--- a/spec/lib/charts_spec.rb
+++ b/spec/lib/charts_spec.rb
@@ -9,6 +9,6 @@ describe Charts::BuildTime do
it 'should return build times in minutes' do
chart = described_class.new(@project)
- chart.build_times.should eq [2]
+ expect(chart.build_times).to eq [2]
end
end
diff --git a/spec/lib/gitlab_ci_yaml_processor_spec.rb b/spec/lib/gitlab_ci_yaml_processor_spec.rb
index aa83f2b..127b8be 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 = described_class.new(config)
- 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({
+ expect(config_processor.builds_for_stage_and_ref(type, "master").size).to eq 1
+ expect(config_processor.builds_for_stage_and_ref(type, "master").first).to eq({
stage: "test",
except: nil,
name: :rspec,
@@ -34,7 +34,7 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should eq 0
+ expect(config_processor.builds_for_stage_and_ref(type, "master").size).to 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 = described_class.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should eq 0
+ expect(config_processor.builds_for_stage_and_ref(type, "master").size).to eq 0
end
it "returns builds if only has specified this branch" do
@@ -56,7 +56,7 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- config_processor.builds_for_stage_and_ref(type, "master").size.should eq 1
+ expect(config_processor.builds_for_stage_and_ref(type, "master").size).to eq 1
end
it "does not build tags" do
@@ -67,7 +67,7 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- config_processor.builds_for_stage_and_ref(type, "0-1", true).size.should eq 0
+ expect(config_processor.builds_for_stage_and_ref(type, "0-1", true).size).to 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 = described_class.new(config)
- config_processor.builds_for_stage_and_ref(type, "deploy").size.should eq 1
+ expect(config_processor.builds_for_stage_and_ref(type, "deploy").size).to eq 1
end
it "returns build only for specified type" do
@@ -93,9 +93,9 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- 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
+ expect(config_processor.builds_for_stage_and_ref("production", "deploy").size).to eq 0
+ expect(config_processor.builds_for_stage_and_ref(type, "deploy").size).to eq 1
+ expect(config_processor.builds_for_stage_and_ref("deploy", "deploy").size).to eq 2
end
end
@@ -110,8 +110,8 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- 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({
+ expect(config_processor.builds_for_stage_and_ref("test", "master").size).to eq 1
+ expect(config_processor.builds_for_stage_and_ref("test", "master").first).to eq({
except: nil,
stage: "test",
name: :rspec,
@@ -136,8 +136,8 @@ describe GitlabCiYamlProcessor do
config_processor = described_class.new(config)
- 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({
+ expect(config_processor.builds_for_stage_and_ref("test", "master").size).to eq 1
+ expect(config_processor.builds_for_stage_and_ref("test", "master").first).to eq({
except: nil,
stage: "test",
name: :rspec,
@@ -166,7 +166,7 @@ describe GitlabCiYamlProcessor do
})
config_processor = described_class.new(config)
- config_processor.variables.should eq variables
+ expect(config_processor.variables).to eq variables
end
end
diff --git a/spec/lib/upgrader_spec.rb b/spec/lib/upgrader_spec.rb
index 90c28cf..64f6f95 100644
--- a/spec/lib/upgrader_spec.rb
+++ b/spec/lib/upgrader_spec.rb
@@ -5,13 +5,13 @@ describe Upgrader do
let(:current_version) { GitlabCi::VERSION }
describe 'current_version_raw' do
- it { upgrader.current_version_raw.should eq current_version }
+ it { expect(upgrader.current_version_raw).to eq current_version }
end
describe 'latest_version?' do
it 'should be true if newest version' do
allow(upgrader).to receive_messages(latest_version_raw: current_version)
- upgrader.latest_version?.should be_truthy
+ expect(upgrader.latest_version?).to be_truthy
end
end
View Lorry Controller Status