Move helpers back to original directory

3 files changed, 3 insertions, 42 deletions

diff --git a/spec/lib/ci/ansi2html_spec.rb b/spec/lib/ci/ansi2html_spec.rb
index aa60011685b..35f115f7f4a 100644
--- a/spec/lib/ci/ansi2html_spec.rb
+++ b/spec/lib/ci/ansi2html_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Ansi2html do
+describe Ci::Ansi2html do
 
   it "prints non-ansi as-is" do
     Ansi2html::convert("Hello").should == 'Hello'
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index ed3d4e84054..efc05676676 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe GitlabCiYamlProcessor do
-  
+describe Ci::GitlabCiYamlProcessor do
+
   describe "#builds_for_ref" do
     let (:type) { 'test' }
 
diff --git a/spec/lib/ci/upgrader_spec.rb b/spec/lib/ci/upgrader_spec.rb
deleted file mode 100644
index 40a98307ad2..00000000000
--- a/spec/lib/ci/upgrader_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-require 'spec_helper'
-
-describe Upgrader do
-  let(:upgrader) { Upgrader.new }
-  let(:current_version) { GitlabCi::VERSION }
-
-  describe 'current_version_raw' do
-    it { upgrader.current_version_raw.should == current_version }
-  end
-
-  describe 'latest_version?' do
-    it 'should be true if newest version' do
-      upgrader.stub(latest_version_raw: current_version)
-      upgrader.latest_version?.should be_true
-    end
-  end
-
-  describe 'latest_version_raw' do
-    it 'should be latest version for GitlabCI 3' do
-        allow(upgrader).to receive(:current_version_raw).and_return('3.0.0')
-        expect(upgrader.latest_version_raw).to eq('v3.2.0')
-    end
-
-    it 'should get the latest version from tags' do
-        allow(upgrader).to receive(:fetch_git_tags).and_return([
-            '1b5bee25b51724214c7a3307ef94027ab93ec982  refs/tags/v7.8.1',
-            '424cb42e35947fa304ef83eb211ffc657e31aef3  refs/tags/v7.8.1^{}',
-            '498e5ba63be1bb99e30c6e720902d864aac4413c  refs/tags/v7.9.0.rc1',
-            '96aaf45ae93bd43e8b3f5d4d353d64d3cbe1e63b  refs/tags/v7.9.0.rc1^{}',
-            '94aaf45ae93bd43e8b3fad4a353d64d3cbe1e62b  refs/tags/v7.1.0',
-            '96aaf45ae93ba13e8b3f5d4d353d64d3cbe1e251  refs/tags/v7.1.0^{}',
-            '29359d64442bf54b4ca1d8b439fd9e5f9cd83252  refs/tags/v7.10.0',
-            '4d9213a6378bff43a69ae099702fb81e29335e7a  refs/tags/v7.10.0^{}',
-            '1d93e1626bda93622ca7a2ae2825e2e94dabf3c6  refs/tags/v7.12.0',
-            '0188a9d1c2efdc52bfad36ad303686be997de713  refs/tags/v7.12.0^{}'])
-        expect(upgrader.latest_version_raw).to eq("v7.12.0")
-    end
-  end
-end