summaryrefslogtreecommitdiff
path: root/spec/features/projects_spec.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-03 14:20:15 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-03 14:20:15 +0000
commitc2c9236cde807e98ff9571f8d23ac4def75eb9ba (patch)
treed73a723a36681d83187e6c75a4b444315d943a9c /spec/features/projects_spec.rb
parenta5b1a3a538bf59e49aea86d7ce2013c0a8d3ac2d (diff)
parent27a3fe8b98798861dc637b2642de24af3ea12d24 (diff)
downloadgitlab-ci-c2c9236cde807e98ff9571f8d23ac4def75eb9ba.tar.gz
Merge branch 'jobs_in_yml' into 'master'
CI configuration with .gitlab-ci.yml https://dev.gitlab.org/gitlab/gitlab-ci/issues/245 Example: ``` # Refs to skip skip_refs: “deploy*” # Run before each script before_script: - export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin - gem install bundler - cp config/database.yml.mysql config/database.yml - cp config/gitlab.yml.example config/gitlab.yml - touch log/application.log - touch log/test.log - bundle install --without postgres production --jobs $(nproc) - bundle exec rake db:create RAILS_ENV=test # Parallel jobs, each line is parallel build jobs: - script: “rake spec” runner: “ruby,postgres” name: “Rspec” - script: “rake spinach” runner: “ruby,mysql” name: “Spinach” tags: true branches: false # Parallel deploy jobs deploy_jobs: “cap deploy production” “cap deploy staging” ``` See merge request !110
Diffstat (limited to 'spec/features/projects_spec.rb')
-rw-r--r--spec/features/projects_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index f01dc11..3f21af9 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -34,12 +34,12 @@ describe "Projects" do
it { page.should have_content 'Build Schedule' }
it "updates configuration" do
- fill_in 'Skip refs', with: 'deploy'
+ fill_in 'Timeout', with: '70'
click_button 'Save changes'
page.should have_content 'was successfully updated'
- find_field('Skip refs').value.should eq 'deploy'
+ find_field('Timeout').value.should eq '70'
end
end