11 files changed, 24 insertions, 24 deletions
diff --git a/spec/models/mail_service_spec.rb b/spec/models/mail_service_spec.rb
index adc0153..3fccc63 100644
--- a/spec/models/mail_service_spec.rb
+++ b/spec/models/mail_service_spec.rb
@@ -28,7 +28,7 @@ describe MailService do
   end
 
   describe 'Sends email for' do
-    let(:mail)   { MailService.new }
+    let(:mail) { described_class.new }
 
     describe 'failed build' do
       let(:project) { FactoryGirl.create(:project, email_add_pusher: true) }
diff --git a/spec/models/network_spec.rb b/spec/models/network_spec.rb
index 199590f..3eac46c 100644
--- a/spec/models/network_spec.rb
+++ b/spec/models/network_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Network do
-  let(:network) { Network.new }
+  let(:network) { described_class.new }
 
   describe '#enable_ci' do
     subject { network.enable_ci '', '', '' }
diff --git a/spec/models/project_services/hip_chat_message_spec.rb b/spec/models/project_services/hip_chat_message_spec.rb
index c2aedd9..db088c7 100644
--- a/spec/models/project_services/hip_chat_message_spec.rb
+++ b/spec/models/project_services/hip_chat_message_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HipChatMessage do
-  subject { HipChatMessage.new(build) }
+  subject { described_class.new(build) }
 
   let(:project) { FactoryGirl.create(:project) }
 
diff --git a/spec/models/project_services/hip_chat_service_spec.rb b/spec/models/project_services/hip_chat_service_spec.rb
index f3137bc..baaecfd 100644
--- a/spec/models/project_services/hip_chat_service_spec.rb
+++ b/spec/models/project_services/hip_chat_service_spec.rb
@@ -32,7 +32,7 @@ describe HipChatService do
 
   describe "Execute" do
 
-    let(:service) { HipChatService.new }
+    let(:service) { described_class.new }
     let(:project) { FactoryGirl.create :project }
     let(:commit)  { FactoryGirl.create :commit, project: project }
     let(:build)   { FactoryGirl.create :build, commit: commit, status: 'failed' }
diff --git a/spec/models/project_services/slack_message_spec.rb b/spec/models/project_services/slack_message_spec.rb
index e599f56..fdbe340 100644
--- a/spec/models/project_services/slack_message_spec.rb
+++ b/spec/models/project_services/slack_message_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SlackMessage do
-  subject { SlackMessage.new(commit) }
+  subject { described_class.new(commit) }
 
   let(:project) { FactoryGirl.create :project }
 
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index 75a321c..80d7c07 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -30,7 +30,7 @@ describe SlackService do
   end
 
   describe "Execute" do
-    let(:slack)   { SlackService.new }
+    let(:slack)   { described_class.new }
     let(:project) { FactoryGirl.create :project }
     let(:commit)  { FactoryGirl.create :commit, project: project }
     let(:build)   { FactoryGirl.create :build, commit: commit, status: 'failed' }
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index d3b0e07..ec30fa8 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -57,7 +57,7 @@ describe Project do
       FactoryGirl.create :commit, committed_at: 1.hour.ago, project: newest_project
       FactoryGirl.create :commit, committed_at: 2.hour.ago, project: oldest_project
 
-      Project.ordered_by_last_commit_date.should eq [newest_project, oldest_project, project_without_commits]
+      described_class.ordered_by_last_commit_date.should eq [newest_project, oldest_project, project_without_commits]
     end
   end
 
@@ -123,19 +123,19 @@ describe Project do
     }
   end
 
-  describe 'Project.parse' do
+  describe '.parse' do
     let(:project_dump) { YAML.load File.read(Rails.root.join('spec/support/gitlab_stubs/raw_project.yml')) }
-    let(:parsed_project) { Project.parse(project_dump) }
+    let(:parsed_project) { described_class.parse(project_dump) }
 
     
     it { parsed_project.should be_valid }
-    it { parsed_project.should be_kind_of(Project) }
+    it { parsed_project.should be_kind_of(described_class) }
     it { parsed_project.name.should eq("GitLab / api.gitlab.org") }
     it { parsed_project.gitlab_id.should eq(189) }
     it { parsed_project.gitlab_url.should eq("http://demo.gitlab.com/gitlab/api-gitlab-org") }
 
     it "parses plain hash" do
-      Project.parse(project_dump).name.should eq("GitLab / api.gitlab.org")
+      described_class.parse(project_dump).name.should eq("GitLab / api.gitlab.org")
     end
   end
 
@@ -154,8 +154,8 @@ describe Project do
   describe '.search' do
     let!(:project) { FactoryGirl.create(:project, name: "foo") }
 
-    it { Project.search('fo').should include(project) }
-    it { Project.search('bar').should be_empty }
+    it { described_class.search('fo').should include(project) }
+    it { described_class.search('bar').should be_empty }
   end
 
   describe '#any_runners' do
diff --git a/spec/models/service_spec.rb b/spec/models/service_spec.rb
index f6b9c00..7380c81 100644
--- a/spec/models/service_spec.rb
+++ b/spec/models/service_spec.rb
@@ -25,7 +25,7 @@ describe Service do
 
   describe "Test Button" do
     before do
-      @service = Service.new
+      @service = described_class.new
     end
 
     describe "Testable" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 57c0b93..9989e3d 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -4,7 +4,7 @@ describe User do
 
   describe "has_developer_access?" do
     before do
-      @user = User.new({})
+      @user = described_class.new({})
     end
 
     let(:project_with_owner_access) do
@@ -53,24 +53,24 @@ describe User do
   end
 
   describe "authorized_projects" do
-    let (:user) { User.new({}) }
+    let (:user) { described_class.new({}) }
 
     before do
       FactoryGirl.create :project, gitlab_id: 1
       FactoryGirl.create :project, gitlab_id: 2
       gitlab_project = OpenStruct.new({id: 1})
       gitlab_project1 = OpenStruct.new({id: 2})
-      allow_any_instance_of(User).to receive(:gitlab_projects).and_return([gitlab_project, gitlab_project1])
+      allow_any_instance_of(described_class).to receive(:gitlab_projects).and_return([gitlab_project, gitlab_project1])
     end
 
     it "returns projects" do
-      allow_any_instance_of(User).to receive(:can_manage_project?).and_return(true)
+      allow_any_instance_of(described_class).to receive(:can_manage_project?).and_return(true)
 
       user.authorized_projects.count.should eq 2
     end
 
     it "empty list if user miss manage permission" do
-      allow_any_instance_of(User).to receive(:can_manage_project?).and_return(false)
+      allow_any_instance_of(described_class).to receive(:can_manage_project?).and_return(false)
 
       user.authorized_projects.count.should eq 0
     end
@@ -82,9 +82,9 @@ describe User do
       project1 = FactoryGirl.create :project, gitlab_id: 2
       gitlab_project = OpenStruct.new({id: 1})
       gitlab_project1 = OpenStruct.new({id: 2})
-      allow_any_instance_of(User).to receive(:gitlab_projects).and_return([gitlab_project, gitlab_project1])
-      allow_any_instance_of(User).to receive(:can_manage_project?).and_return(true)
-      user = User.new({})
+      allow_any_instance_of(described_class).to receive(:gitlab_projects).and_return([gitlab_project, gitlab_project1])
+      allow_any_instance_of(described_class).to receive(:can_manage_project?).and_return(true)
+      user = described_class.new({})
 
       runner = FactoryGirl.create :specific_runner
       runner1 = FactoryGirl.create :specific_runner
diff --git a/spec/models/variable_spec.rb b/spec/models/variable_spec.rb
index 51ae2d2..c089df9 100644
--- a/spec/models/variable_spec.rb
+++ b/spec/models/variable_spec.rb
@@ -14,7 +14,7 @@
 require 'spec_helper'
 
 describe Variable do
-  subject { Variable.new }
+  subject { described_class.new }
 
   let(:secret_value) { 'secret' }
 
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index e3fa31c..100d9a9 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -54,7 +54,7 @@ describe WebHook do
     end
 
     it "catches exceptions" do
-      WebHook.should_receive(:post).and_raise("Some HTTP Post error")
+      described_class.should_receive(:post).and_raise("Some HTTP Post error")
 
       expect { @web_hook.execute(@data) }.
         to raise_error(RuntimeError, 'Some HTTP Post error')