diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-10 19:12:14 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-10 19:12:14 +0300 |
commit | 9a9417ee8e8f3d8fe8320eaaf150ff1eb77a471e (patch) | |
tree | add4ba1b5fa9bdcbde9666653c48841e2b7db2ef /spec/models/ci | |
parent | dc2e38e56db43c86e7ecf44c01234130f648d350 (diff) |
Fix more tests
Diffstat (limited to 'spec/models/ci')
5 files changed, 13 insertions, 63 deletions
diff --git a/spec/models/ci/project_services/hip_chat_message_spec.rb b/spec/models/ci/project_services/hip_chat_message_spec.rb index 7318898b3b4..49ac0860259 100644 --- a/spec/models/ci/project_services/hip_chat_message_spec.rb +++ b/spec/models/ci/project_services/hip_chat_message_spec.rb @@ -1,12 +1,12 @@ require 'spec_helper' describe Ci::HipChatMessage do - subject { HipChatMessage.new(build) } + subject { Ci::HipChatMessage.new(build) } - let(:project) { FactoryGirl.create(:project) } + let(:project) { FactoryGirl.create(:ci_project) } context "One build" do - let(:commit) { FactoryGirl.create(:commit_with_one_job, project: project) } + let(:commit) { FactoryGirl.create(:ci_commit_with_one_job, project: project) } let(:build) do commit.create_builds @@ -37,7 +37,7 @@ describe Ci::HipChatMessage do end context "Several builds" do - let(:commit) { FactoryGirl.create(:commit_with_two_jobs, project: project) } + let(:commit) { FactoryGirl.create(:ci_commit_with_two_jobs, project: project) } let(:build) do commit.builds.first diff --git a/spec/models/ci/project_services/hip_chat_service_spec.rb b/spec/models/ci/project_services/hip_chat_service_spec.rb index 5d1c6c0900b..33a3a8109e5 100644 --- a/spec/models/ci/project_services/hip_chat_service_spec.rb +++ b/spec/models/ci/project_services/hip_chat_service_spec.rb @@ -32,10 +32,10 @@ describe Ci::HipChatService do describe "Execute" do - let(:service) { HipChatService.new } - let(:project) { FactoryGirl.create :project } - let(:commit) { FactoryGirl.create :commit, project: project } - let(:build) { FactoryGirl.create :build, commit: commit, status: 'failed' } + let(:service) { Ci::HipChatService.new } + let(:project) { FactoryGirl.create :ci_project } + let(:commit) { FactoryGirl.create :ci_commit, project: project } + let(:build) { FactoryGirl.create :ci_build, commit: commit, status: 'failed' } let(:api_url) { 'https://api.hipchat.com/v2/room/123/notification?auth_token=a1b2c3d4e5f6' } before do diff --git a/spec/models/ci/project_services/slack_message_spec.rb b/spec/models/ci/project_services/slack_message_spec.rb index 8d3bf86ae7a..ef0714909d5 100644 --- a/spec/models/ci/project_services/slack_message_spec.rb +++ b/spec/models/ci/project_services/slack_message_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' describe Ci::SlackMessage do subject { SlackMessage.new(commit) } - let(:project) { FactoryGirl.create :project } + let(:project) { FactoryGirl.create :ci_project } context "One build" do - let(:commit) { FactoryGirl.create(:commit_with_one_job, project: project) } + let(:commit) { FactoryGirl.create(:ci_commit_with_one_job, project: project) } let(:build) do commit.create_builds diff --git a/spec/models/ci/project_services/slack_service_spec.rb b/spec/models/ci/project_services/slack_service_spec.rb index 3f064bffc89..ae577adfb75 100644 --- a/spec/models/ci/project_services/slack_service_spec.rb +++ b/spec/models/ci/project_services/slack_service_spec.rb @@ -31,9 +31,9 @@ describe Ci::SlackService do describe "Execute" do let(:slack) { SlackService.new } - let(:project) { FactoryGirl.create :project } - let(:commit) { FactoryGirl.create :commit, project: project } - let(:build) { FactoryGirl.create :build, commit: commit, status: 'failed' } + let(:project) { FactoryGirl.create :ci_project } + let(:commit) { FactoryGirl.create :ci_commit, project: project } + let(:build) { FactoryGirl.create :ci_build, commit: commit, status: 'failed' } let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' } let(:notify_only_broken_builds) { false } diff --git a/spec/models/ci/user_spec.rb b/spec/models/ci/user_spec.rb deleted file mode 100644 index df42d4ddb8e..00000000000 --- a/spec/models/ci/user_spec.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'spec_helper' - -describe Ci::User do - - describe "authorized_projects" do - let (:user) { User.new({}) } - - before do - FactoryGirl.create :ci_project, gitlab_id: 1 - FactoryGirl.create :ci_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]) - end - - it "returns projects" do - allow_any_instance_of(User).to receive(:can_manage_project?).and_return(true) - - expect(user.authorized_projects.count).to 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) - - expect(user.authorized_projects.count).to eq(0) - end - end - - describe "authorized_runners" do - it "returns authorized runners" do - project = FactoryGirl.create :ci_project, gitlab_id: 1 - project1 = FactoryGirl.create :ci_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({}) - - runner = FactoryGirl.create :ci_specific_runner - runner1 = FactoryGirl.create :ci_specific_runner - runner2 = FactoryGirl.create :ci_specific_runner - - project.runners << runner - project1.runners << runner1 - - expect(user.authorized_runners).to include(runner, runner1) - expect(user.authorized_runners).not_to include(runner2) - end - end -end |