diff options
| author | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-03-21 09:08:28 -0600 |
| commit | 0b75b821c6cfd173291fcfd88c41da9922d082dd (patch) | |
| tree | 41b578d299bd77423aa3591955a4cb5ca07ab025 /qa | |
| parent | 6342da7bb6cbba1b1e026fc62a1da42b811b25f4 (diff) | |
| parent | a08c707c928092426e2334423e71c6b841309ddf (diff) | |
| download | gitlab-ce-issue-title-vue.tar.gz | |
update to current master and fix conflictsissue-title-vue
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/.gitignore | 1 | ||||
| -rw-r--r-- | qa/Dockerfile | 5 | ||||
| -rw-r--r-- | qa/Gemfile.lock | 61 | ||||
| -rw-r--r-- | qa/qa/page/main/entry.rb | 10 |
4 files changed, 74 insertions, 3 deletions
diff --git a/qa/.gitignore b/qa/.gitignore new file mode 100644 index 00000000000..3fec32c8427 --- /dev/null +++ b/qa/.gitignore @@ -0,0 +1 @@ +tmp/ diff --git a/qa/Dockerfile b/qa/Dockerfile index 2814a7bdef0..72c82503542 100644 --- a/qa/Dockerfile +++ b/qa/Dockerfile @@ -8,7 +8,10 @@ RUN sed -i "s/httpredir.debian.org/ftp.us.debian.org/" /etc/apt/sources.list && WORKDIR /home/qa -COPY ./ ./ +COPY ./Gemfile* ./ + RUN bundle install +COPY ./ ./ + ENTRYPOINT ["bin/test"] diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock new file mode 100644 index 00000000000..6de2abff198 --- /dev/null +++ b/qa/Gemfile.lock @@ -0,0 +1,61 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) + capybara (2.12.1) + addressable + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + capybara-screenshot (1.0.14) + capybara (>= 1.0, < 3) + launchy + capybara-webkit (1.12.0) + capybara (>= 2.3.0, < 2.13.0) + json + diff-lcs (1.3) + json (2.0.3) + launchy (2.4.3) + addressable (~> 2.3) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + nokogiri (1.7.0.1) + mini_portile2 (~> 2.1.0) + public_suffix (2.0.5) + rack (2.0.1) + rack-test (0.6.3) + rack (>= 1.0) + rake (12.0.0) + rspec (3.5.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-core (3.5.4) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + capybara (~> 2.12.1) + capybara-screenshot (~> 1.0.14) + capybara-webkit (~> 1.12.0) + rake (~> 12.0.0) + rspec (~> 3.5) + +BUNDLED WITH + 1.14.6 diff --git a/qa/qa/page/main/entry.rb b/qa/qa/page/main/entry.rb index fe80deb6429..a9810beeb29 100644 --- a/qa/qa/page/main/entry.rb +++ b/qa/qa/page/main/entry.rb @@ -5,8 +5,14 @@ module QA def initialize visit('/') - # This resolves cold boot problems with login page - find('.application', wait: 120) + # This resolves cold boot / background tasks problems + # + start = Time.now + + while Time.now - start < 240 + break if page.has_css?('.application', wait: 10) + refresh + end end def sign_in_using_credentials |