Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,6 @@ FROM ruby:2.4.2
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
RUN apt-get install -y build-essential libpq-dev nodejs

# Install PhantomJS for tests - see https://blog.codeship.com/testing-rails-application-docker/
ENV PHANTOMJS_VERSION 2.1.1
RUN set -ex; \
mkdir -p /usr/local/share/phantomjs; \
curl -fsSL https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-${PHANTOMJS_VERSION}-linux-x86_64.tar.bz2 \
| tar xj -C /usr/local/share/phantomjs --strip-components=1; \
ln -s /usr/local/share/phantomjs/bin/phantomjs /usr/local/bin/phantomjs

WORKDIR /planner

COPY Gemfile Gemfile.lock ./
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ end
group :test do
gem 'capybara'
gem 'database_cleaner'
gem 'poltergeist'
gem 'shoulda-matchers', '~> 3.1'
end

Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ The current Dockerfile and docker-compose were closely copied from [the Docker g
Run `bin/drake` to run all the tests and make sure everything works.
You can also use `bin/drails` and `bin/dspec` to run specific rails and rspec commands via docker.

*Note:* JavaScript acceptance tests are relying on the [Poltergeist](https://github.com/teampoltergeist/poltergeist) driver, which requires
[PhantomJS](http://phantomjs.org). For more information about installing PhantomJS, please take a look
[here](https://github.com/teampoltergeist/poltergeist#installing-phantomjs).
*Note:* Running feature tests with JavaScript enabled is currently not setup correctly (and currently there are no tests that require this anyway). This is due to the removal of the previous PhantomJS/Poltergeist setup. This will be replaced in due course with headless Chrome.

### 5. Start the app

Expand Down
3 changes: 1 addition & 2 deletions native-installation-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ brew services start postgresql
Install other dependencies:
```
brew install imagemagick
brew install phantomjs
```

Install the Gems:
Expand Down Expand Up @@ -85,4 +84,4 @@ bundle exec rails server

```bash
bundle exec rake
```
```
2 changes: 0 additions & 2 deletions spec/support/capybara.rb

This file was deleted.