Skip to content

Commit 102cf23

Browse files
committed
fix linting offenses and exclude application.css from scss-lint
1 parent c07d23d commit 102cf23

File tree

5 files changed

+39
-34
lines changed

5 files changed

+39
-34
lines changed

.scss-lint.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
scss_files:
44
- 'spec/dummy/app/assets/stylesheets/**/*.scss'
5-
5+
exclude:
6+
- 'spec/dummy/app/assets/stylesheets/application.css'
67
linters:
78
# BangFormat:
89
# enabled: true

.travis.yml

+34-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,49 @@
1+
sudo: required
2+
13
language: ruby
4+
25
rvm:
3-
- 2.2.2
6+
- 2.2.3
7+
8+
services:
9+
- docker
410

511
gemfile:
6-
- spec/dummy/Gemfile
12+
- spec/dummy/Gemfile
713

814
env:
9-
- export RAILS_ENV=test
15+
- export RAILS_ENV=test
16+
17+
before_install:
18+
- sudo apt-get update
19+
- curl -L https://github.com/docker/compose/releases/download/1.4.0/docker-compose-`uname -s`-`uname -m` > docker-compose
20+
- chmod +x docker-compose
21+
- sudo mv docker-compose /usr/local/bin
22+
- docker-compose build lint
23+
- apt-get install -y xserver-common libgl1-mesa-glx libxfont1 libxshmfence1
24+
- curl -O http://http.us.debian.org/debian/pool/main/x/xorg-server/xvfb_1.16.4-1_amd64.deb
25+
- dpkg -i xvfb_1.16.4-1_amd64.deb
26+
- apt-get install -y firefox firefox-locale-en
1027

1128
install:
12-
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4.2.0
13-
- npm install -g npm
14-
- bundle install
15-
- cd spec/dummy/client && npm install
16-
- $(npm bin)/webpack --config webpack.server.js
17-
- $(npm bin)/webpack --config webpack.client.js
18-
- cd ../../dummy-react-013/client && npm install
19-
- $(npm bin)/webpack --config webpack.server.js
20-
- $(npm bin)/webpack --config webpack.client.js
29+
- rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install 4.2.0
30+
- npm install -g npm
31+
- bundle install
32+
- cd spec/dummy/client && npm install
33+
- $(npm bin)/webpack --config webpack.server.js
34+
- $(npm bin)/webpack --config webpack.client.js
35+
- cd ../../dummy-react-013/client && npm install
36+
- $(npm bin)/webpack --config webpack.server.js
37+
- $(npm bin)/webpack --config webpack.client.js
2138

2239
before_script:
23-
- cd ../../
24-
- export DISPLAY=:99.0
25-
- sh -e /etc/init.d/xvfb start
40+
- cd ../../
41+
- export DISPLAY=:99
42+
- sh -e Xvfb :99 -screen 0 1600x1200x16
2643

2744
script:
28-
- rake
45+
- rake docker
46+
- rake
2947

3048
notifications:
3149
slack:

Dockerfile

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1 @@
1-
FROM ruby:2.2.3
2-
MAINTAINER Dylan Grafmyre <[email protected]>
3-
4-
RUN mkdir -p /app
5-
WORKDIR /app/
6-
# Setup container for linting with ruby and npm
7-
RUN gem install rubocop ruby-lint scss_lint
8-
RUN curl --silent --location https://deb.nodesource.com/setup_0.12 | bash -
9-
RUN apt-get install -y nodejs
10-
RUN npm install -g eslint \
11-
eslint-config-airbnb \
12-
eslint-plugin-react \
13-
babel-eslint \
14-
jscs
15-
RUN gem install coveralls
1+
FROM dylangrafmyre/docker-lint

spec/dummy-react-013/config/routes.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See how all your routes lay out with "rake routes".
44

55
# You can have the root of your site routed with "root"
6-
root 'pages#index'
6+
root "pages#index"
77

88
get "client_side_hello_world" => "pages#client_side_hello_world"
99
get "server_side_hello_world" => "pages#server_side_hello_world"

spec/dummy/config/routes.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# See how all your routes lay out with "rake routes".
44

55
# You can have the root of your site routed with "root"
6-
root 'pages#index'
6+
root "pages#index"
77

88
get "client_side_hello_world" => "pages#client_side_hello_world"
99
get "server_side_hello_world" => "pages#server_side_hello_world"

0 commit comments

Comments
 (0)