jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Albert Yi
2018-05-09 14:36:03 -07:00
parent 59dde72924
commit c144159dd9
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/docker/danbooru-base
View File

@@ -6,7 +6,7 @@ RUN apt-get -y install wget
RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ RUN wget -q https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz && rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils libavcodec-dev mkvtoolnix emacs24-nox telnet libvips42 libvips-tools libvips-dev > /dev/null RUN apt-get -y install -qq apt-utils build-essential automake libssl-dev libxml2-dev libxslt-dev ncurses-dev sudo libreadline-dev flex bison ragel memcached libmemcached-dev git curl libcurl4-openssl-dev imagemagick libmagickcore-dev libmagickwand-dev sendmail-bin sendmail postgresql-client libpq-dev nginx ssh coreutils ffmpeg mkvtoolnix emacs24-nox telnet libvips42 libvips-tools libvips-dev > /dev/null
RUN useradd -ms /bin/bash danbooru -u 1000 RUN useradd -ms /bin/bash danbooru -u 1000
RUN mkdir /app RUN mkdir /app
RUN mkdir -p /var/www/danbooru/shared/data RUN mkdir -p /var/www/danbooru/shared/data

1
config/docker/danbooru-ci
View File

@@ -3,7 +3,6 @@
FROM r888888888/danbooru-base FROM r888888888/danbooru-base
USER root USER root
RUN apt-get install -y ffmpeg
COPY . /app COPY . /app
RUN chown -R danbooru:danbooru . RUN chown -R danbooru:danbooru .
USER danbooru USER danbooru

4
test/factories/user.rb
View File

@@ -1,6 +1,8 @@
FactoryBot.define do FactoryBot.define do
factory(:user, aliases: [:creator, :updater]) do factory(:user, aliases: [:creator, :updater]) do
name {(rand(1_000_000) + 10).to_s} sequence :name do |n|
"user#{n}"
end
password "password" password "password"
password_hash {User.sha1("password")} password_hash {User.sha1("password")}
email {FFaker::Internet.email} email {FFaker::Internet.email}