Skip to content
Snippets Groups Projects

Revert "Fix for failing specs"

Merged Revert "Fix for failing specs"
github/fork/jvanbaarsen/revert-rspec-fix into master
Merged gitlab-qa-bot requested to merge github/fork/jvanbaarsen/revert-rspec-fix into master

Created by: jvanbaarsen

@randx please revert this as quick as possible, it looks like the fix i created in this PR is causing rspec to skip tests. I'm currently working on a new fix for the specs, but this one is causing more issues apparently.

This reverts commit 23144389.

Conflicts: Gemfile.lock

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
features/support/env.rb
28 28 require 'capybara/poltergeist'
29 29 Capybara.javascript_driver = :poltergeist
30 30 Capybara.register_driver :poltergeist do |app|
31 Capybara::Poltergeist::Driver.new(app, js_errors: false, timeout: 90)
31 Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60)
  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: houndci-bot

    Use the new Ruby 1.9 hash syntax.
    Use 2 (not 4) spaces for indentation.

    By Administrator on 2014-06-05T18:22:55 (imported from GitLab project)

    By Administrator on 2014-06-05T18:22:55 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    /cc @maxlazio @jacobvosmaer

    By Administrator on 2014-06-05T18:23:24 (imported from GitLab project)

    By Administrator on 2014-06-05T18:23:24 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jvanbaarsen ok I merge this.

    By Administrator on 2014-06-05T18:45:33 (imported from GitLab project)

    By Administrator on 2014-06-05T18:45:33 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    @randx Thanks, Sorry for the confusion!

    By Administrator on 2014-06-05T19:01:34 (imported from GitLab project)

    By Administrator on 2014-06-05T19:01:34 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jvanbaarsen i have exception after this merged:

    -> rake db:migrate 
rake aborted!
LoadError: cannot load such file -- minitest

    By Administrator on 2014-06-05T19:13:16 (imported from GitLab project)

    By Administrator on 2014-06-05T19:13:16 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    Did you rebundle?

    By Administrator on 2014-06-05T19:13:53 (imported from GitLab project)

    By Administrator on 2014-06-05T19:13:53 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jvanbaarsen bundle install? yes i did

    By Administrator on 2014-06-05T19:14:22 (imported from GitLab project)

    By Administrator on 2014-06-05T19:14:22 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    Ok, ill check it, hang on!

    By Administrator on 2014-06-05T19:14:43 (imported from GitLab project)

    By Administrator on 2014-06-05T19:14:43 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    same for ci:

    Your bundle is complete!
Gems in the group postgres were not installed.
Use `bundle show [gemname]` to see where a bundled gem is installed.
bundle exec rake db:create RAILS_ENV=test
rake aborted!
LoadError: cannot load such file -- minitest

    By Administrator on 2014-06-05T19:14:47 (imported from GitLab project)

    By Administrator on 2014-06-05T19:14:47 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    hmm, when i remove Gemfile.lock and regenerated it again, it worked

    By Administrator on 2014-06-05T19:18:05 (imported from GitLab project)

    By Administrator on 2014-06-05T19:18:05 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    Let me create another MR with the correct Gemfile.lock

    By Administrator on 2014-06-05T19:18:19 (imported from GitLab project)

    By Administrator on 2014-06-05T19:18:19 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: dzaporozhets

    @jvanbaarsen ok waiting for it. Dont want to have broken builds for too long

    By Administrator on 2014-06-05T19:19:50 (imported from GitLab project)

    By Administrator on 2014-06-05T19:19:50 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    Yeah, im working on it right now! Sorry!

    By Administrator on 2014-06-05T19:20:14 (imported from GitLab project)

    By Administrator on 2014-06-05T19:20:14 (imported from GitLab)

  • gitlab-qa-bot
    gitlab-qa-bot @gitlab-qa-bot ·
    Author Owner

    Created by: jvanbaarsen

    See https://github.com/gitlabhq/gitlabhq/pull/7087

    By Administrator on 2014-06-05T19:21:17 (imported from GitLab project)

    By Administrator on 2014-06-05T19:21:17 (imported from GitLab)

    • Please register or sign in to reply