summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-05 20:37:27 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-05 20:37:27 +0300
commitdaed5cd19daa3eab68edf19e1818f6501f92ef4b (patch)
treeabd9b570147876793cad09bde70218cc388b9ab6
parent991e9f2cc26204a1114219f80e86263984e1e149 (diff)
downloadgitlab-ci-daed5cd19daa3eab68edf19e1818f6501f92ef4b.tar.gz
Fix web hook specs
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r--spec/factories/web_hook.rb1
-rw-r--r--spec/models/web_hook_spec.rb3
-rw-r--r--spec/services/web_hook_service_spec.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/factories/web_hook.rb b/spec/factories/web_hook.rb
index 23ca830..3c027fb 100644
--- a/spec/factories/web_hook.rb
+++ b/spec/factories/web_hook.rb
@@ -1,5 +1,6 @@
FactoryGirl.define do
factory :web_hook do
sequence(:url) { Faker::Internet.uri('http') }
+ project
end
end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index c8ca95d..acbb136 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -28,8 +28,7 @@ describe WebHook do
describe "execute" do
before(:each) do
@web_hook = FactoryGirl.create(:web_hook)
- @project = FactoryGirl.create(:project)
- @project.web_hooks << [@web_hook]
+ @project = @web_hook.project
@data = { before: 'oldrev', after: 'newrev', ref: 'ref'}
WebMock.stub_request(:post, @web_hook.url)
diff --git a/spec/services/web_hook_service_spec.rb b/spec/services/web_hook_service_spec.rb
index 1ddb4dc..699c126 100644
--- a/spec/services/web_hook_service_spec.rb
+++ b/spec/services/web_hook_service_spec.rb
@@ -13,7 +13,7 @@ describe WebHookService do
end
context 'build_data' do
- it { build_data(build).should include :id, :project_id, :ref, :status, :started_at, :finished_at, :before_sha, :project_name, :gitlab_url }
+ it { build_data(build).should include :build_id, :project_id, :ref, :build_status, :build_started_at, :build_finished_at, :before_sha, :project_name, :gitlab_url }
end
def build_data(build)