diff --git a/.env.test b/.env.test deleted file mode 120000 index e05d8b354..000000000 --- a/.env.test +++ /dev/null @@ -1 +0,0 @@ -.env_sample \ No newline at end of file diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a98912cc..8f0944d87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -120,6 +120,7 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true + - run: cp .env_sample .env - run: bundle exec rails db:test:prepare - name: RSpec run: bin/knapsack_pro_rspec @@ -274,6 +275,7 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true + - run: cp .env_sample .env - run: bundle exec rails db:test:prepare - run: yarn cypress install - name: cypress diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml index 23a2b28f4..75bacf18c 100644 --- a/.github/workflows/uffizzi-build.yml +++ b/.github/workflows/uffizzi-build.yml @@ -27,7 +27,7 @@ jobs: - uses: actions/checkout@master - name: Create the .env file run: | - cp .env.test .env + cp .env_sample .env - name: Build and Push Image to registry.uffizzi.com ephemeral registry uses: docker/build-push-action@v2 with: diff --git a/spec/system/comments/user_edits_a_comment_spec.rb b/spec/system/comments/user_edits_a_comment_spec.rb index 14846df2c..b5aed848c 100644 --- a/spec/system/comments/user_edits_a_comment_spec.rb +++ b/spec/system/comments/user_edits_a_comment_spec.rb @@ -52,15 +52,8 @@ RSpec.describe "Editing A Comment", :js do click_on(class: "comment__dropdown-trigger") click_link_or_button("Edit") + expect(page).to have_link("Dismiss") assert_updated end end - - context "when user edits via direct path (no referer)" do - it "cancels to the article page" do - user.reload - visit "#{comment.path}/edit" - expect(page).to have_link("Dismiss") - end - end end