summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-11-16 17:24:49 +0000
committerFilipa Lacerda <filipa@gitlab.com>2016-11-16 17:24:49 +0000
commit022764cc768ce7739eee1e097671249201cba5a4 (patch)
treecde6295cdee4410a495e86475d5beb7790f22cc4
parent1571d4686d0fbb41d603ee0deafe208f5d23e5c1 (diff)
downloadgitlab-ce-022764cc768ce7739eee1e097671249201cba5a4.tar.gz
Tests
-rw-r--r--app/assets/javascripts/environments/components/environment_actions.js.es62
-rw-r--r--spec/features/environments_spec.rb4
-rw-r--r--spec/javascripts/environments/environment_stop_spec.js.es62
3 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/environments/components/environment_actions.js.es6 b/app/assets/javascripts/environments/components/environment_actions.js.es6
index 1f5ae74dbb1..1941392ac66 100644
--- a/app/assets/javascripts/environments/components/environment_actions.js.es6
+++ b/app/assets/javascripts/environments/components/environment_actions.js.es6
@@ -51,7 +51,7 @@
<ul class="dropdown-menu dropdown-menu-align-right">
<li v-for="action in actions">
- <a :href="action.play_url" data-method="post" rel="nofollow">
+ <a :href="action.play_url" data-method="post" data-rel="nofollow" class="js-manual-action-link">
<span class="action-play-icon-container">
<!-- svg goes here -->
</span>
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index fe5a783a386..a9228283272 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -75,14 +75,12 @@ feature 'Environments', feature: true, js: true do
scenario 'does show a play button' do
# TODO: Fix me!
- binding.pry
- expect(page).to have_link(manual.name.humanize)
+ expect(page).to have_content(manual.name.humanize)
end
scenario 'does allow to play manual action' do
expect(manual).to be_skipped
# TODO: Fix me!
- binding.pry
expect{ click_link(manual.name.humanize) }.not_to change { Ci::Pipeline.count }
expect(page).to have_content(manual.name)
expect(manual.reload).to be_pending
diff --git a/spec/javascripts/environments/environment_stop_spec.js.es6 b/spec/javascripts/environments/environment_stop_spec.js.es6
index 07a68bf28fb..20eb8c92322 100644
--- a/spec/javascripts/environments/environment_stop_spec.js.es6
+++ b/spec/javascripts/environments/environment_stop_spec.js.es6
@@ -14,7 +14,7 @@ describe('Stop Component', () => {
stop_url: stopURL,
},
});
- expect(component.$el.getAttribute('href')).toEqual(stopURL);
+ expect(component.$el.getAttribute('href')).toEqual(`${stopURL}/stop`);
});
describe('When clicked', () => {